Merge pull request #638 from kinvolk/iaguis/fix-aws-upgrades

kinvolk · Jun 18, 2020 · 84c3265 · 84c3265
2 parents f16c6d0 + 8167a4e
commit 84c3265
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/assets/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/workers/ingress.tf b/assets/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/workers/ingress.tf
@@ -5,7 +5,7 @@ resource "aws_lb_listener" "ingress-http" {
 
   default_action {
     type             = "forward"
-    target_group_arn = aws_lb_target_group.workers-http.arn
+    target_group_arn = aws_lb_target_group.workers_http.arn
   }
 }
 
@@ -16,11 +16,11 @@ resource "aws_lb_listener" "ingress-https" {
 
   default_action {
     type             = "forward"
-    target_group_arn = aws_lb_target_group.workers-https.arn
+    target_group_arn = aws_lb_target_group.workers_https.arn
   }
 }
 
-resource "aws_lb_target_group" "workers-http" {
+resource "aws_lb_target_group" "workers_http" {
   vpc_id      = var.vpc_id
   target_type = "instance"
 
@@ -45,7 +45,7 @@ resource "aws_lb_target_group" "workers-http" {
   }
 }
 
-resource "aws_lb_target_group" "workers-https" {
+resource "aws_lb_target_group" "workers_https" {
   vpc_id      = var.vpc_id
   target_type = "instance"
 

diff --git a/assets/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/workers/outputs.tf b/assets/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/workers/outputs.tf
@@ -1,9 +1,9 @@
 output "target_group_http" {
   description = "ARN of a target group of workers for HTTP traffic"
-  value       = aws_lb_target_group.workers-http.arn
+  value       = aws_lb_target_group.workers_http.arn
 }
 
 output "target_group_https" {
   description = "ARN of a target group of workers for HTTPS traffic"
-  value       = aws_lb_target_group.workers-https.arn
+  value       = aws_lb_target_group.workers_https.arn
 }
diff --git a/assets/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/workers/workers.tf b/assets/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/workers/workers.tf
@@ -1,6 +1,6 @@
 # Workers AutoScaling Group
 resource "aws_autoscaling_group" "workers" {
-  name = "${var.cluster_name}-${var.pool_name}-workers"
+  name = "${var.pool_name}-worker"
 
   # count
   desired_capacity          = var.worker_count
@@ -17,8 +17,8 @@ resource "aws_autoscaling_group" "workers" {
 
   # target groups to which instances should be added
   target_group_arns = flatten([
-    aws_lb_target_group.workers-http.id,
-    aws_lb_target_group.workers-https.id,
+    aws_lb_target_group.workers_http.id,
+    aws_lb_target_group.workers_https.id,
     var.target_groups,
   ])
 

diff --git a/pkg/assets/generated_assets.go b/pkg/assets/generated_assets.go