CadolesKube
/
typhoon
mirror of https://github.com/puppetmaster/typhoon.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve AWS autoscaling group and launch config names 

* Rename launch configuration to use a name_prefix named after the
cluster and worker to improve identifiability
* Shorten AWS autoscaling group name to not include the launch config
id. Years ago this used to be needed to update the ASG but the AWS
provider detects changes to the launch configuration just fine
This commit is contained in:
Dalton Hubble 2022-08-08 20:46:08 -07:00
parent 93b7f2554e
commit 87a8278c9d
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.md
View File

@ -28,6 +28,11 @@ version: 1.0.0
... ...
``` ```
### AWS
* Rename worker autoscaling group `${cluster_name}-worker`
* Rename launch configuration `${cluster_name}-worker`
### Google ### Google
* Fix bug provisioning clusters with multiple controller nodes ([#1195](https://github.com/poseidon/typhoon/pull/1195)) * Fix bug provisioning clusters with multiple controller nodes ([#1195](https://github.com/poseidon/typhoon/pull/1195))

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

@ -1,3 +1,7 @@
locals {
ami_id = var.arch == "arm64" ? data.aws_ami.fedora-coreos-arm[0].image_id : data.aws_ami.fedora-coreos.image_id
}
data "aws_ami" "fedora-coreos" { data "aws_ami" "fedora-coreos" {
most_recent = true most_recent = true
owners = ["125523088429"] owners = ["125523088429"]

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

@ -1,6 +1,6 @@
# Workers AutoScaling Group # Workers AutoScaling Group
resource "aws_autoscaling_group" "workers" { resource "aws_autoscaling_group" "workers" {
name = "${var.name}-worker ${aws_launch_configuration.worker.name}" name = "${var.name}-worker"
# count # count
desired_capacity = var.worker_count desired_capacity = var.worker_count
@ -42,7 +42,8 @@ resource "aws_autoscaling_group" "workers" {
# Worker template # Worker template
resource "aws_launch_configuration" "worker" { resource "aws_launch_configuration" "worker" {
image_id = var.arch == "arm64" ? data.aws_ami.fedora-coreos-arm[0].image_id : data.aws_ami.fedora-coreos.image_id name_prefix = "${var.name}-worker"
image_id = local.ami_id
instance_type = var.instance_type instance_type = var.instance_type
spot_price = var.spot_price > 0 ? var.spot_price : null spot_price = var.spot_price > 0 ? var.spot_price : null
enable_monitoring = false enable_monitoring = false

3
aws/flatcar-linux/kubernetes/workers/workers.tf
View File

@ -1,6 +1,6 @@
# Workers AutoScaling Group # Workers AutoScaling Group
resource "aws_autoscaling_group" "workers" { resource "aws_autoscaling_group" "workers" {
name = "${var.name}-worker ${aws_launch_configuration.worker.name}" name = "${var.name}-worker"
# count # count
desired_capacity = var.worker_count desired_capacity = var.worker_count
@ -42,6 +42,7 @@ resource "aws_autoscaling_group" "workers" {
# Worker template # Worker template
resource "aws_launch_configuration" "worker" { resource "aws_launch_configuration" "worker" {
name_prefix = "${var.name}-worker"
image_id = local.ami_id image_id = local.ami_id
instance_type = var.instance_type instance_type = var.instance_type
spot_price = var.spot_price > 0 ? var.spot_price : null spot_price = var.spot_price > 0 ? var.spot_price : null