Merge pull request #33 from WesleyCharlesBlake/bug/node-group-tagging

adds better name tags to nodes
WesleyCharlesBlake · Sep 18, 2019 · b4d009d · b4d009d
2 parents 07a18c3 + c6938ee
commit b4d009d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/modules/eks/bastion.tf b/modules/eks/bastion.tf
@@ -6,9 +6,9 @@ variable "ec2-key" {}
 module "bastion-asg" {
   source  = "terraform-aws-modules/autoscaling/aws"
   version = "~> 3.0"
-  name    = "bastion-asg"
+  name    = "${var.cluster-name}-bastion"
 
-  lc_name = "bastion-lc"
+  lc_name = "${var.cluster-name}-bastion-lc"
 
   image_id                     = data.aws_ami.bastion.id
   instance_type                = "t2.small"
@@ -25,7 +25,7 @@ module "bastion-asg" {
   ]
 
   # Auto scaling group
-  asg_name                  = "bastion"
+  asg_name                  = "${var.cluster-name}-bastion"
   vpc_zone_identifier       = data.aws_subnet_ids.public.ids
   health_check_type         = "EC2"
   min_size                  = 1
@@ -36,10 +36,9 @@ module "bastion-asg" {
 
   tags = [
     {
-      key                 = "Name"
-      value               = "bastion"
+      key                 = "kubernetes.io/cluster/${var.cluster-name}"
+      value               = "owned"
       propagate_at_launch = true
     }
   ]
-
 }
diff --git a/modules/eks/eks-worker-nodes.tf b/modules/eks/eks-worker-nodes.tf
@@ -21,7 +21,7 @@ USERDATA
 module "eks-nodes-asg" {
   source  = "terraform-aws-modules/autoscaling/aws"
   version = "~> 3.0"
-  name    = "eks-nodes-asg"
+  name    = "${var.cluster-name}-eks-nodes"
 
   # Launch configuration
   #