CadolesKube/typhoon
7
0
Fork 0
mirror of https://github.com/puppetmaster/typhoon.git synced 2025-07-30 15:31:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support Fedora CoreOS OS image streams on AWS

Browse Source 
* Add `os_stream` variable to set the stream to stable (default),
testing, or next
* Remove unused os_image variable on Fedora CoreOS AWS
This commit is contained in:
Dalton Hubble
2020-05-13 21:37:18 -07:00
parent f4194cd57a
commit 01905b00bc
6 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
aws/fedora-coreos/kubernetes/ami.tf
View File

@ -13,16 +13,8 @@ data "aws_ami" "fedora-coreos" {
values = ["hvm"]
}
filter {
name = "name"
values = ["fedora-coreos-31.*.*.*-hvm"]
}
filter {
name = "description"
values = ["Fedora CoreOS stable*"]
values = ["Fedora CoreOS ${var.os_stream} *"]
}
# try to filter out dev images (AWS filters can't)
name_regex = "^fedora-coreos-31.[0-9]*.[0-9]*.[0-9]*-hvm*"
}

4
aws/fedora-coreos/kubernetes/variables.tf
View File

@ -41,9 +41,9 @@ variable "worker_type" {
default = "t3.small"
}
variable "os_image" {
variable "os_stream" {
type = string
description = "AMI channel for Fedora CoreOS (not yet used)"
description = "Fedora CoreOs image stream for instances (e.g. stable, testing, next)"
default = "stable"
}

2
aws/fedora-coreos/kubernetes/workers.tf
View File

@ -8,7 +8,7 @@ module "workers" {
security_groups = [aws_security_group.worker.id]
worker_count = var.worker_count
instance_type = var.worker_type
os_image = var.os_image
os_stream = var.os_stream
disk_size = var.disk_size
spot_price = var.worker_price
target_groups = var.worker_target_groups

10
aws/fedora-coreos/kubernetes/workers/ami.tf
View File

@ -13,16 +13,8 @@ data "aws_ami" "fedora-coreos" {
values = ["hvm"]
}
filter {
name = "name"
values = ["fedora-coreos-31.*.*.*-hvm"]
}
filter {
name = "description"
values = ["Fedora CoreOS stable*"]
values = ["Fedora CoreOS ${var.os_stream} *"]
}
# try to filter out dev images (AWS filters can't)
name_regex = "^fedora-coreos-31.[0-9]*.[0-9]*.[0-9]*-hvm*"
}

4
aws/fedora-coreos/kubernetes/workers/variables.tf
View File

@ -34,9 +34,9 @@ variable "instance_type" {
default = "t3.small"
}
variable "os_image" {
variable "os_stream" {
type = string
description = "AMI channel for Fedora CoreOS (not yet used)"
description = "Fedora CoreOs image stream for instances (e.g. stable, testing, next)"
default = "stable"
}