From 21cb8ece063499bbb9d5e62fb75942b89771abce Mon Sep 17 00:00:00 2001 From: Justin SB Date: Mon, 2 Sep 2019 09:26:23 -0700 Subject: [PATCH] Label AWS ASGs with kops.k8s.io/instancegroup We will use this to map an AWS instance to the instance group. --- pkg/model/context.go | 2 ++ .../additional_cidr/cloudformation.json | 10 ++++++++ .../additional_cidr/kubernetes.tf | 24 +++++++++++++++++++ .../additional_user-data/cloudformation.json | 10 ++++++++ .../api_elb_cross_zone/kubernetes.tf | 12 ++++++++++ .../bastionadditional_user-data/kubernetes.tf | 18 ++++++++++++++ .../update_cluster/complex/kubernetes.tf | 12 ++++++++++ .../update_cluster/existing_iam/kubernetes.tf | 24 +++++++++++++++++++ .../cloudformation.json | 10 ++++++++ .../update_cluster/existing_sg/kubernetes.tf | 24 +++++++++++++++++++ .../externallb/cloudformation.json | 10 ++++++++ .../update_cluster/externallb/kubernetes.tf | 12 ++++++++++ .../update_cluster/ha/kubernetes.tf | 24 +++++++++++++++++++ .../update_cluster/minimal-141/kubernetes.tf | 12 ++++++++++ .../cloudformation.json | 10 ++++++++ .../update_cluster/minimal/kubernetes.tf | 12 ++++++++++ .../mixed_instances/cloudformation.json | 20 ++++++++++++++++ .../mixed_instances/kubernetes.tf | 24 +++++++++++++++++++ .../mixed_instances_spot/cloudformation.json | 20 ++++++++++++++++ .../mixed_instances_spot/kubernetes.tf | 24 +++++++++++++++++++ .../private-shared-subnet/kubernetes.tf | 18 ++++++++++++++ .../privatecalico/kubernetes.tf | 18 ++++++++++++++ .../update_cluster/privatecanal/kubernetes.tf | 18 ++++++++++++++ .../update_cluster/privatedns1/kubernetes.tf | 18 ++++++++++++++ .../update_cluster/privatedns2/kubernetes.tf | 18 ++++++++++++++ .../privateflannel/kubernetes.tf | 18 ++++++++++++++ .../privatekopeio/kubernetes.tf | 18 ++++++++++++++ .../update_cluster/privateweave/kubernetes.tf | 18 ++++++++++++++ .../restrict_access/kubernetes.tf | 12 ++++++++++ .../shared_subnet/kubernetes.tf | 12 ++++++++++ .../update_cluster/shared_vpc/kubernetes.tf | 12 ++++++++++ .../update_cluster/unmanaged/kubernetes.tf | 18 ++++++++++++++ 32 files changed, 512 insertions(+) diff --git a/pkg/model/context.go b/pkg/model/context.go index 9bd23a5de1..56fda147d0 100644 --- a/pkg/model/context.go +++ b/pkg/model/context.go @@ -221,6 +221,8 @@ func (m *KopsModelContext) CloudTagsForInstanceGroup(ig *kops.InstanceGroup) (ma labels[awstasks.CloudTagInstanceGroupRolePrefix+strings.ToLower(string(kops.InstanceGroupRoleBastion))] = "1" } + labels["kops.k8s.io/instancegroup" /*nodeidentityaws.CloudTagInstanceGroupName*/] = ig.Name + return labels, nil } diff --git a/tests/integration/update_cluster/additional_cidr/cloudformation.json b/tests/integration/update_cluster/additional_cidr/cloudformation.json index b519b35ee3..1d3a421ad7 100644 --- a/tests/integration/update_cluster/additional_cidr/cloudformation.json +++ b/tests/integration/update_cluster/additional_cidr/cloudformation.json @@ -29,6 +29,11 @@ "Key": "k8s.io/role/master", "Value": "1", "PropagateAtLaunch": true + }, + { + "Key": "kops.k8s.io/instancegroup", + "Value": "master-us-test-1b", + "PropagateAtLaunch": true } ], "MetricsCollection": [ @@ -77,6 +82,11 @@ "Key": "k8s.io/role/node", "Value": "1", "PropagateAtLaunch": true + }, + { + "Key": "kops.k8s.io/instancegroup", + "Value": "nodes", + "PropagateAtLaunch": true } ], "MetricsCollection": [ diff --git a/tests/integration/update_cluster/additional_cidr/kubernetes.tf b/tests/integration/update_cluster/additional_cidr/kubernetes.tf index 3ac2c7c30c..83d9617792 100644 --- a/tests/integration/update_cluster/additional_cidr/kubernetes.tf +++ b/tests/integration/update_cluster/additional_cidr/kubernetes.tf @@ -115,6 +115,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-additionalcidr-examp propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -144,6 +150,12 @@ resource "aws_autoscaling_group" "master-us-test-1b-masters-additionalcidr-examp propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1b" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -173,6 +185,12 @@ resource "aws_autoscaling_group" "master-us-test-1c-masters-additionalcidr-examp propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1c" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -202,6 +220,12 @@ resource "aws_autoscaling_group" "nodes-additionalcidr-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } diff --git a/tests/integration/update_cluster/additional_user-data/cloudformation.json b/tests/integration/update_cluster/additional_user-data/cloudformation.json index 3bdb45e01b..350d220c81 100644 --- a/tests/integration/update_cluster/additional_user-data/cloudformation.json +++ b/tests/integration/update_cluster/additional_user-data/cloudformation.json @@ -29,6 +29,11 @@ "Key": "k8s.io/role/master", "Value": "1", "PropagateAtLaunch": true + }, + { + "Key": "kops.k8s.io/instancegroup", + "Value": "master-us-test-1a", + "PropagateAtLaunch": true } ], "MetricsCollection": [ @@ -77,6 +82,11 @@ "Key": "k8s.io/role/node", "Value": "1", "PropagateAtLaunch": true + }, + { + "Key": "kops.k8s.io/instancegroup", + "Value": "nodes", + "PropagateAtLaunch": true } ], "MetricsCollection": [ diff --git a/tests/integration/update_cluster/api_elb_cross_zone/kubernetes.tf b/tests/integration/update_cluster/api_elb_cross_zone/kubernetes.tf index 13b89e7e0a..89d87beb0a 100644 --- a/tests/integration/update_cluster/api_elb_cross_zone/kubernetes.tf +++ b/tests/integration/update_cluster/api_elb_cross_zone/kubernetes.tf @@ -122,6 +122,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-crosszone-example-co propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -163,6 +169,12 @@ resource "aws_autoscaling_group" "nodes-crosszone-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] suspended_processes = ["AZRebalance"] diff --git a/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf b/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf index 8f9dae1c8b..069975a765 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf +++ b/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf @@ -145,6 +145,12 @@ resource "aws_autoscaling_group" "bastion-bastionuserdata-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "bastion" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -174,6 +180,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-bastionuserdata-exam propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -203,6 +215,12 @@ resource "aws_autoscaling_group" "nodes-bastionuserdata-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } diff --git a/tests/integration/update_cluster/complex/kubernetes.tf b/tests/integration/update_cluster/complex/kubernetes.tf index e2cdd34f24..e21b951ac7 100644 --- a/tests/integration/update_cluster/complex/kubernetes.tf +++ b/tests/integration/update_cluster/complex/kubernetes.tf @@ -122,6 +122,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-complex-example-com" propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -163,6 +169,12 @@ resource "aws_autoscaling_group" "nodes-complex-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] suspended_processes = ["AZRebalance"] diff --git a/tests/integration/update_cluster/existing_iam/kubernetes.tf b/tests/integration/update_cluster/existing_iam/kubernetes.tf index bff32cb1be..7c8ee1354f 100644 --- a/tests/integration/update_cluster/existing_iam/kubernetes.tf +++ b/tests/integration/update_cluster/existing_iam/kubernetes.tf @@ -95,6 +95,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-existing-iam-example propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -124,6 +130,12 @@ resource "aws_autoscaling_group" "master-us-test-1b-masters-existing-iam-example propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1b" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -153,6 +165,12 @@ resource "aws_autoscaling_group" "master-us-test-1c-masters-existing-iam-example propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1c" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -182,6 +200,12 @@ resource "aws_autoscaling_group" "nodes-existing-iam-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } diff --git a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json index 7155f1f062..d025c5d562 100644 --- a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json +++ b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json @@ -29,6 +29,11 @@ "Key": "k8s.io/role/master", "Value": "1", "PropagateAtLaunch": true + }, + { + "Key": "kops.k8s.io/instancegroup", + "Value": "master-us-test-1a", + "PropagateAtLaunch": true } ], "MetricsCollection": [ @@ -77,6 +82,11 @@ "Key": "k8s.io/role/node", "Value": "1", "PropagateAtLaunch": true + }, + { + "Key": "kops.k8s.io/instancegroup", + "Value": "nodes", + "PropagateAtLaunch": true } ], "MetricsCollection": [ diff --git a/tests/integration/update_cluster/existing_sg/kubernetes.tf b/tests/integration/update_cluster/existing_sg/kubernetes.tf index 14f96c55bf..05b8200655 100644 --- a/tests/integration/update_cluster/existing_sg/kubernetes.tf +++ b/tests/integration/update_cluster/existing_sg/kubernetes.tf @@ -130,6 +130,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-existingsg-example-c propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -159,6 +165,12 @@ resource "aws_autoscaling_group" "master-us-test-1b-masters-existingsg-example-c propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1b" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -188,6 +200,12 @@ resource "aws_autoscaling_group" "master-us-test-1c-masters-existingsg-example-c propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1c" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -217,6 +235,12 @@ resource "aws_autoscaling_group" "nodes-existingsg-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } diff --git a/tests/integration/update_cluster/externallb/cloudformation.json b/tests/integration/update_cluster/externallb/cloudformation.json index f4cf78e72c..30f4c084fe 100644 --- a/tests/integration/update_cluster/externallb/cloudformation.json +++ b/tests/integration/update_cluster/externallb/cloudformation.json @@ -29,6 +29,11 @@ "Key": "k8s.io/role/master", "Value": "1", "PropagateAtLaunch": true + }, + { + "Key": "kops.k8s.io/instancegroup", + "Value": "master-us-test-1a", + "PropagateAtLaunch": true } ], "MetricsCollection": [ @@ -83,6 +88,11 @@ "Key": "k8s.io/role/node", "Value": "1", "PropagateAtLaunch": true + }, + { + "Key": "kops.k8s.io/instancegroup", + "Value": "nodes", + "PropagateAtLaunch": true } ], "MetricsCollection": [ diff --git a/tests/integration/update_cluster/externallb/kubernetes.tf b/tests/integration/update_cluster/externallb/kubernetes.tf index 87f3d98b37..ad4240650d 100644 --- a/tests/integration/update_cluster/externallb/kubernetes.tf +++ b/tests/integration/update_cluster/externallb/kubernetes.tf @@ -120,6 +120,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-externallb-example-c propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -149,6 +155,12 @@ resource "aws_autoscaling_group" "nodes-externallb-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } diff --git a/tests/integration/update_cluster/ha/kubernetes.tf b/tests/integration/update_cluster/ha/kubernetes.tf index ea76690416..45b153af4e 100644 --- a/tests/integration/update_cluster/ha/kubernetes.tf +++ b/tests/integration/update_cluster/ha/kubernetes.tf @@ -115,6 +115,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-ha-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -144,6 +150,12 @@ resource "aws_autoscaling_group" "master-us-test-1b-masters-ha-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1b" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -173,6 +185,12 @@ resource "aws_autoscaling_group" "master-us-test-1c-masters-ha-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1c" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -202,6 +220,12 @@ resource "aws_autoscaling_group" "nodes-ha-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } diff --git a/tests/integration/update_cluster/minimal-141/kubernetes.tf b/tests/integration/update_cluster/minimal-141/kubernetes.tf index 85cd6e2baf..5890bb806e 100644 --- a/tests/integration/update_cluster/minimal-141/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-141/kubernetes.tf @@ -105,6 +105,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-minimal-141-example- propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -134,6 +140,12 @@ resource "aws_autoscaling_group" "nodes-minimal-141-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } diff --git a/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json b/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json index eb8078a3d5..5c3cc58bb8 100644 --- a/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json +++ b/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json @@ -29,6 +29,11 @@ "Key": "k8s.io/role/master", "Value": "1", "PropagateAtLaunch": true + }, + { + "Key": "kops.k8s.io/instancegroup", + "Value": "master-us-test-1a", + "PropagateAtLaunch": true } ], "MetricsCollection": [ @@ -77,6 +82,11 @@ "Key": "k8s.io/role/node", "Value": "1", "PropagateAtLaunch": true + }, + { + "Key": "kops.k8s.io/instancegroup", + "Value": "nodes", + "PropagateAtLaunch": true } ], "MetricsCollection": [ diff --git a/tests/integration/update_cluster/minimal/kubernetes.tf b/tests/integration/update_cluster/minimal/kubernetes.tf index 4747ed9400..5be341f34b 100644 --- a/tests/integration/update_cluster/minimal/kubernetes.tf +++ b/tests/integration/update_cluster/minimal/kubernetes.tf @@ -105,6 +105,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-minimal-example-com" propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -134,6 +140,12 @@ resource "aws_autoscaling_group" "nodes-minimal-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } diff --git a/tests/integration/update_cluster/mixed_instances/cloudformation.json b/tests/integration/update_cluster/mixed_instances/cloudformation.json index 9ee86f98c1..55110e119c 100644 --- a/tests/integration/update_cluster/mixed_instances/cloudformation.json +++ b/tests/integration/update_cluster/mixed_instances/cloudformation.json @@ -29,6 +29,11 @@ "Key": "k8s.io/role/master", "Value": "1", "PropagateAtLaunch": true + }, + { + "Key": "kops.k8s.io/instancegroup", + "Value": "master-us-test-1a", + "PropagateAtLaunch": true } ], "MetricsCollection": [ @@ -77,6 +82,11 @@ "Key": "k8s.io/role/master", "Value": "1", "PropagateAtLaunch": true + }, + { + "Key": "kops.k8s.io/instancegroup", + "Value": "master-us-test-1b", + "PropagateAtLaunch": true } ], "MetricsCollection": [ @@ -125,6 +135,11 @@ "Key": "k8s.io/role/master", "Value": "1", "PropagateAtLaunch": true + }, + { + "Key": "kops.k8s.io/instancegroup", + "Value": "master-us-test-1c", + "PropagateAtLaunch": true } ], "MetricsCollection": [ @@ -170,6 +185,11 @@ "Key": "k8s.io/role/node", "Value": "1", "PropagateAtLaunch": true + }, + { + "Key": "kops.k8s.io/instancegroup", + "Value": "nodes", + "PropagateAtLaunch": true } ], "MetricsCollection": [ diff --git a/tests/integration/update_cluster/mixed_instances/kubernetes.tf b/tests/integration/update_cluster/mixed_instances/kubernetes.tf index c2e536eee8..08c5e95a20 100644 --- a/tests/integration/update_cluster/mixed_instances/kubernetes.tf +++ b/tests/integration/update_cluster/mixed_instances/kubernetes.tf @@ -115,6 +115,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-mixedinstances-examp propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -144,6 +150,12 @@ resource "aws_autoscaling_group" "master-us-test-1b-masters-mixedinstances-examp propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1b" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -173,6 +185,12 @@ resource "aws_autoscaling_group" "master-us-test-1c-masters-mixedinstances-examp propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1c" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -228,6 +246,12 @@ resource "aws_autoscaling_group" "nodes-mixedinstances-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] protect_from_scale_in = true diff --git a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json index 65ef4fec38..f8c0f0241d 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json +++ b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json @@ -29,6 +29,11 @@ "Key": "k8s.io/role/master", "Value": "1", "PropagateAtLaunch": true + }, + { + "Key": "kops.k8s.io/instancegroup", + "Value": "master-us-test-1a", + "PropagateAtLaunch": true } ], "MetricsCollection": [ @@ -77,6 +82,11 @@ "Key": "k8s.io/role/master", "Value": "1", "PropagateAtLaunch": true + }, + { + "Key": "kops.k8s.io/instancegroup", + "Value": "master-us-test-1b", + "PropagateAtLaunch": true } ], "MetricsCollection": [ @@ -125,6 +135,11 @@ "Key": "k8s.io/role/master", "Value": "1", "PropagateAtLaunch": true + }, + { + "Key": "kops.k8s.io/instancegroup", + "Value": "master-us-test-1c", + "PropagateAtLaunch": true } ], "MetricsCollection": [ @@ -170,6 +185,11 @@ "Key": "k8s.io/role/node", "Value": "1", "PropagateAtLaunch": true + }, + { + "Key": "kops.k8s.io/instancegroup", + "Value": "nodes", + "PropagateAtLaunch": true } ], "MetricsCollection": [ diff --git a/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf b/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf index 4d8a3ef212..3d1d60353d 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf +++ b/tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf @@ -115,6 +115,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-mixedinstances-examp propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -144,6 +150,12 @@ resource "aws_autoscaling_group" "master-us-test-1b-masters-mixedinstances-examp propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1b" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -173,6 +185,12 @@ resource "aws_autoscaling_group" "master-us-test-1c-masters-mixedinstances-examp propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1c" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -229,6 +247,12 @@ resource "aws_autoscaling_group" "nodes-mixedinstances-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } diff --git a/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf b/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf index f943813bd0..1fd50815b0 100644 --- a/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf +++ b/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf @@ -135,6 +135,12 @@ resource "aws_autoscaling_group" "bastion-private-shared-subnet-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "bastion" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -164,6 +170,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-private-shared-subne propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -193,6 +205,12 @@ resource "aws_autoscaling_group" "nodes-private-shared-subnet-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } diff --git a/tests/integration/update_cluster/privatecalico/kubernetes.tf b/tests/integration/update_cluster/privatecalico/kubernetes.tf index c8f014cbdd..bd06b8bfdf 100644 --- a/tests/integration/update_cluster/privatecalico/kubernetes.tf +++ b/tests/integration/update_cluster/privatecalico/kubernetes.tf @@ -145,6 +145,12 @@ resource "aws_autoscaling_group" "bastion-privatecalico-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "bastion" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -174,6 +180,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-privatecalico-exampl propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -203,6 +215,12 @@ resource "aws_autoscaling_group" "nodes-privatecalico-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } diff --git a/tests/integration/update_cluster/privatecanal/kubernetes.tf b/tests/integration/update_cluster/privatecanal/kubernetes.tf index f8f1286312..36443f4efa 100644 --- a/tests/integration/update_cluster/privatecanal/kubernetes.tf +++ b/tests/integration/update_cluster/privatecanal/kubernetes.tf @@ -145,6 +145,12 @@ resource "aws_autoscaling_group" "bastion-privatecanal-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "bastion" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -174,6 +180,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-privatecanal-example propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -203,6 +215,12 @@ resource "aws_autoscaling_group" "nodes-privatecanal-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } diff --git a/tests/integration/update_cluster/privatedns1/kubernetes.tf b/tests/integration/update_cluster/privatedns1/kubernetes.tf index c8cb6ece24..959038cf30 100644 --- a/tests/integration/update_cluster/privatedns1/kubernetes.tf +++ b/tests/integration/update_cluster/privatedns1/kubernetes.tf @@ -145,6 +145,12 @@ resource "aws_autoscaling_group" "bastion-privatedns1-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "bastion" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -174,6 +180,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-privatedns1-example- propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -203,6 +215,12 @@ resource "aws_autoscaling_group" "nodes-privatedns1-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } diff --git a/tests/integration/update_cluster/privatedns2/kubernetes.tf b/tests/integration/update_cluster/privatedns2/kubernetes.tf index 618e85adfe..59c98724d7 100644 --- a/tests/integration/update_cluster/privatedns2/kubernetes.tf +++ b/tests/integration/update_cluster/privatedns2/kubernetes.tf @@ -140,6 +140,12 @@ resource "aws_autoscaling_group" "bastion-privatedns2-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "bastion" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -169,6 +175,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-privatedns2-example- propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -198,6 +210,12 @@ resource "aws_autoscaling_group" "nodes-privatedns2-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } diff --git a/tests/integration/update_cluster/privateflannel/kubernetes.tf b/tests/integration/update_cluster/privateflannel/kubernetes.tf index 82a618d4f8..3b0fae6032 100644 --- a/tests/integration/update_cluster/privateflannel/kubernetes.tf +++ b/tests/integration/update_cluster/privateflannel/kubernetes.tf @@ -145,6 +145,12 @@ resource "aws_autoscaling_group" "bastion-privateflannel-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "bastion" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -174,6 +180,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-privateflannel-examp propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -203,6 +215,12 @@ resource "aws_autoscaling_group" "nodes-privateflannel-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } diff --git a/tests/integration/update_cluster/privatekopeio/kubernetes.tf b/tests/integration/update_cluster/privatekopeio/kubernetes.tf index 64fc3457a1..3531d509b7 100644 --- a/tests/integration/update_cluster/privatekopeio/kubernetes.tf +++ b/tests/integration/update_cluster/privatekopeio/kubernetes.tf @@ -160,6 +160,12 @@ resource "aws_autoscaling_group" "bastion-privatekopeio-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "bastion" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -189,6 +195,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-privatekopeio-exampl propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -218,6 +230,12 @@ resource "aws_autoscaling_group" "nodes-privatekopeio-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } diff --git a/tests/integration/update_cluster/privateweave/kubernetes.tf b/tests/integration/update_cluster/privateweave/kubernetes.tf index 2ff8341d03..4b270ece83 100644 --- a/tests/integration/update_cluster/privateweave/kubernetes.tf +++ b/tests/integration/update_cluster/privateweave/kubernetes.tf @@ -145,6 +145,12 @@ resource "aws_autoscaling_group" "bastion-privateweave-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "bastion" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -174,6 +180,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-privateweave-example propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -203,6 +215,12 @@ resource "aws_autoscaling_group" "nodes-privateweave-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } diff --git a/tests/integration/update_cluster/restrict_access/kubernetes.tf b/tests/integration/update_cluster/restrict_access/kubernetes.tf index f02a2dea90..e503504e7a 100644 --- a/tests/integration/update_cluster/restrict_access/kubernetes.tf +++ b/tests/integration/update_cluster/restrict_access/kubernetes.tf @@ -105,6 +105,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-restrictaccess-examp propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -134,6 +140,12 @@ resource "aws_autoscaling_group" "nodes-restrictaccess-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } diff --git a/tests/integration/update_cluster/shared_subnet/kubernetes.tf b/tests/integration/update_cluster/shared_subnet/kubernetes.tf index 4fed5f1cdf..b3dff8024a 100644 --- a/tests/integration/update_cluster/shared_subnet/kubernetes.tf +++ b/tests/integration/update_cluster/shared_subnet/kubernetes.tf @@ -100,6 +100,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-sharedsubnet-example propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -129,6 +135,12 @@ resource "aws_autoscaling_group" "nodes-sharedsubnet-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } diff --git a/tests/integration/update_cluster/shared_vpc/kubernetes.tf b/tests/integration/update_cluster/shared_vpc/kubernetes.tf index c523b2f43c..b9507a5400 100644 --- a/tests/integration/update_cluster/shared_vpc/kubernetes.tf +++ b/tests/integration/update_cluster/shared_vpc/kubernetes.tf @@ -100,6 +100,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-sharedvpc-example-co propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -129,6 +135,12 @@ resource "aws_autoscaling_group" "nodes-sharedvpc-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } diff --git a/tests/integration/update_cluster/unmanaged/kubernetes.tf b/tests/integration/update_cluster/unmanaged/kubernetes.tf index 92914414f7..d0e8197bf7 100644 --- a/tests/integration/update_cluster/unmanaged/kubernetes.tf +++ b/tests/integration/update_cluster/unmanaged/kubernetes.tf @@ -140,6 +140,12 @@ resource "aws_autoscaling_group" "bastion-unmanaged-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "bastion" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -169,6 +175,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-unmanaged-example-co propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "master-us-test-1a" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] } @@ -198,6 +210,12 @@ resource "aws_autoscaling_group" "nodes-unmanaged-example-com" { propagate_at_launch = true } + tag = { + key = "kops.k8s.io/instancegroup" + value = "nodes" + propagate_at_launch = true + } + metrics_granularity = "1Minute" enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"] }