CadolesKube/typhoon
7
0
Fork 0
mirror of https://github.com/puppetmaster/typhoon.git synced 2024-12-24 18:19:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Switch FCOS workers to official Fedora CoreOS AMIs

Browse Source 
* Fix worker nodes to use official Fedora CoreOS AMIs,
instead of the older Poseidon built AMIs (now removed).
This should have been part of #1038, but was missed in
code review
* Poseidon build AMIs have been deleted (so I don't have
to keep paying to host them for people)
This commit is contained in:
Dalton Hubble 2021-12-07 15:19:08 -08:00
parent 298ea65d3e
commit 85252dec6e
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,3 @@
data "aws_ami" "fedora-coreos" { data "aws_ami" "fedora-coreos" {
most_recent = true most_recent = true
owners = ["125523088429"] owners = ["125523088429"]
@ -18,6 +17,7 @@ data "aws_ami" "fedora-coreos" {
values = ["Fedora CoreOS ${var.os_stream} *"] values = ["Fedora CoreOS ${var.os_stream} *"]
} }
} }
data "aws_ami" "fedora-coreos-arm" { data "aws_ami" "fedora-coreos-arm" {
count = var.arch == "arm64" ? 1 : 0 count = var.arch == "arm64" ? 1 : 0

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

@ -1,4 +1,3 @@
data "aws_ami" "fedora-coreos" { data "aws_ami" "fedora-coreos" {
most_recent = true most_recent = true
owners = ["125523088429"] owners = ["125523088429"]
@ -19,14 +18,11 @@ data "aws_ami" "fedora-coreos" {
} }
} }
# Experimental Fedora CoreOS arm64 / aarch64 AMIs from Poseidon
# WARNING: These AMIs will be removed when Fedora CoreOS publishes arm64 AMIs
# and may be removed for any reason before then as well. Do not use.
data "aws_ami" "fedora-coreos-arm" { data "aws_ami" "fedora-coreos-arm" {
count = var.arch == "arm64" ? 1 : 0 count = var.arch == "arm64" ? 1 : 0
most_recent = true most_recent = true
owners = ["099663496933"] owners = ["125523088429"]
filter { filter {
name = "architecture" name = "architecture"
@ -39,8 +35,7 @@ data "aws_ami" "fedora-coreos-arm" {
} }
filter { filter {
name = "name" name = "description"
values = ["fedora-coreos-*"] values = ["Fedora CoreOS ${var.os_stream} *"]
} }
} }