kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8660 from hakman/root-voumes-owned-tag 

Add "owned" tag for volumes and instances created with launch templates
This commit is contained in:
Kubernetes Prow Robot 2020-03-02 08:24:44 -08:00 committed by GitHub
parent e160b37228 661bd6dfbd
commit 0624935ba1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
39 changed files with 590 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/model/context.go
View File

@ -183,7 +183,7 @@ func (m *KopsModelContext) NodeInstanceGroups() []*kops.InstanceGroup {
// CloudTagsForInstanceGroup computes the tags to apply to instances in the specified InstanceGroup
func (m *KopsModelContext) CloudTagsForInstanceGroup(ig *kops.InstanceGroup) (map[string]string, error) {
labels := make(map[string]string)
labels := m.CloudTags(m.AutoscalingGroupName(ig), false)
// Apply any user-specified global labels first so they can be overridden by IG-specific labels
for k, v := range m.Cluster.Spec.CloudLabels {
@ -208,10 +208,6 @@ func (m *KopsModelContext) CloudTagsForInstanceGroup(ig *kops.InstanceGroup) (ma
}
}
// Add cluster and ig names
labels[awsup.TagClusterName] = m.ClusterName()
labels["Name"] = m.AutoscalingGroupName(ig)
// The system tags take priority because the cluster likely breaks without them...
if ig.Spec.Role == kops.InstanceGroupRoleMaster {

10
tests/integration/update_cluster/additional_cidr/cloudformation.json
View File

@ -34,6 +34,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "master-us-test-1b",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/additionalcidr.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [
@ -87,6 +92,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "nodes",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/additionalcidr.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [

24
tests/integration/update_cluster/additional_cidr/kubernetes.tf
View File

@ -121,6 +121,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-additionalcidr-examp
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/additionalcidr.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -156,6 +162,12 @@ resource "aws_autoscaling_group" "master-us-test-1b-masters-additionalcidr-examp
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/additionalcidr.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -191,6 +203,12 @@ resource "aws_autoscaling_group" "master-us-test-1c-masters-additionalcidr-examp
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/additionalcidr.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -226,6 +244,12 @@ resource "aws_autoscaling_group" "nodes-additionalcidr-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/additionalcidr.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}

10
tests/integration/update_cluster/additional_user-data/cloudformation.json
View File

@ -34,6 +34,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "master-us-test-1a",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/additionaluserdata.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [
@ -87,6 +92,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "nodes",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/additionaluserdata.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [

12
tests/integration/update_cluster/api_elb_cross_zone/kubernetes.tf
View File

@ -128,6 +128,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-crosszone-example-co
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/crosszone.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -175,6 +181,12 @@ resource "aws_autoscaling_group" "nodes-crosszone-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/crosszone.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
suspended_processes = ["AZRebalance"]

18
tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf
View File

@ -151,6 +151,12 @@ resource "aws_autoscaling_group" "bastion-bastionuserdata-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/bastionuserdata.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -186,6 +192,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-bastionuserdata-exam
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/bastionuserdata.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -221,6 +233,12 @@ resource "aws_autoscaling_group" "nodes-bastionuserdata-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/bastionuserdata.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}

10
tests/integration/update_cluster/complex/cloudformation.json
View File

@ -44,6 +44,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "master-us-test-1a",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/complex.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [
@ -112,6 +117,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "nodes",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/complex.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [

12
tests/integration/update_cluster/complex/kubernetes.tf
View File

@ -128,6 +128,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-complex-example-com"
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/complex.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -175,6 +181,12 @@ resource "aws_autoscaling_group" "nodes-complex-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/complex.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
suspended_processes = ["AZRebalance"]

10
tests/integration/update_cluster/containerd-cloudformation/cloudformation.json
View File

@ -34,6 +34,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "master-us-test-1a",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/containerd.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [
@ -87,6 +92,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "nodes",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/containerd.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [

24
tests/integration/update_cluster/existing_iam/kubernetes.tf
View File

@ -101,6 +101,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-existing-iam-example
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/existing-iam.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -136,6 +142,12 @@ resource "aws_autoscaling_group" "master-us-test-1b-masters-existing-iam-example
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/existing-iam.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -171,6 +183,12 @@ resource "aws_autoscaling_group" "master-us-test-1c-masters-existing-iam-example
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/existing-iam.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -206,6 +224,12 @@ resource "aws_autoscaling_group" "nodes-existing-iam-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/existing-iam.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}

10
tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json
View File

@ -34,6 +34,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "master-us-test-1a",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/minimal.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [
@ -87,6 +92,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "nodes",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/minimal.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [

24
tests/integration/update_cluster/existing_sg/kubernetes.tf
View File

@ -136,6 +136,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-existingsg-example-c
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/existingsg.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -171,6 +177,12 @@ resource "aws_autoscaling_group" "master-us-test-1b-masters-existingsg-example-c
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/existingsg.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -206,6 +218,12 @@ resource "aws_autoscaling_group" "master-us-test-1c-masters-existingsg-example-c
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/existingsg.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -241,6 +259,12 @@ resource "aws_autoscaling_group" "nodes-existingsg-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/existingsg.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}

10
tests/integration/update_cluster/externallb/cloudformation.json
View File

@ -34,6 +34,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "master-us-test-1a",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/externallb.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [
@ -93,6 +98,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "nodes",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/externallb.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [

12
tests/integration/update_cluster/externallb/kubernetes.tf
View File

@ -126,6 +126,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-externallb-example-c
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/externallb.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -161,6 +167,12 @@ resource "aws_autoscaling_group" "nodes-externallb-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/externallb.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}

12
tests/integration/update_cluster/externalpolicies/kubernetes.tf
View File

@ -128,6 +128,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-externalpolicies-exa
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/externalpolicies.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -175,6 +181,12 @@ resource "aws_autoscaling_group" "nodes-externalpolicies-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/externalpolicies.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
suspended_processes = ["AZRebalance"]

24
tests/integration/update_cluster/ha/kubernetes.tf
View File

@ -121,6 +121,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-ha-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/ha.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -156,6 +162,12 @@ resource "aws_autoscaling_group" "master-us-test-1b-masters-ha-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/ha.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -191,6 +203,12 @@ resource "aws_autoscaling_group" "master-us-test-1c-masters-ha-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/ha.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -226,6 +244,12 @@ resource "aws_autoscaling_group" "nodes-ha-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/ha.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}

12
tests/integration/update_cluster/minimal-141/kubernetes.tf
View File

@ -111,6 +111,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-minimal-141-example-
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/minimal-141.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -146,6 +152,12 @@ resource "aws_autoscaling_group" "nodes-minimal-141-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/minimal-141.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}

10
tests/integration/update_cluster/minimal-cloudformation/cloudformation.json
View File

@ -34,6 +34,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "master-us-test-1a",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/minimal.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [
@ -87,6 +92,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "nodes",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/minimal.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [

10
tests/integration/update_cluster/minimal-json/kubernetes.tf.json
View File

@ -118,6 +118,11 @@
"key": "kops.k8s.io/instancegroup",
"value": "master-us-test-1a",
"propagate_at_launch": true
},
{
"key": "kubernetes.io/cluster/minimal-json.example.com",
"value": "owned",
"propagate_at_launch": true
}
],
"metrics_granularity": "1Minute",
@ -160,6 +165,11 @@
"key": "kops.k8s.io/instancegroup",
"value": "nodes",
"propagate_at_launch": true
},
{
"key": "kubernetes.io/cluster/minimal-json.example.com",
"value": "owned",
"propagate_at_launch": true
}
],
"metrics_granularity": "1Minute",

12
tests/integration/update_cluster/minimal/kubernetes.tf
View File

@ -111,6 +111,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-minimal-example-com"
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/minimal.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -146,6 +152,12 @@ resource "aws_autoscaling_group" "nodes-minimal-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/minimal.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}

20
tests/integration/update_cluster/mixed_instances/cloudformation.json
View File

@ -34,6 +34,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "master-us-test-1a",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/mixedinstances.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [
@ -87,6 +92,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "master-us-test-1b",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/mixedinstances.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [
@ -140,6 +150,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "master-us-test-1c",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/mixedinstances.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [
@ -190,6 +205,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "nodes",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/mixedinstances.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [

24
tests/integration/update_cluster/mixed_instances/kubernetes.tf
View File

@ -121,6 +121,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-mixedinstances-examp
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/mixedinstances.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -156,6 +162,12 @@ resource "aws_autoscaling_group" "master-us-test-1b-masters-mixedinstances-examp
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/mixedinstances.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -191,6 +203,12 @@ resource "aws_autoscaling_group" "master-us-test-1c-masters-mixedinstances-examp
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/mixedinstances.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -252,6 +270,12 @@ resource "aws_autoscaling_group" "nodes-mixedinstances-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/mixedinstances.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
protect_from_scale_in = true

20
tests/integration/update_cluster/mixed_instances_spot/cloudformation.json
View File

@ -34,6 +34,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "master-us-test-1a",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/mixedinstances.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [
@ -87,6 +92,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "master-us-test-1b",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/mixedinstances.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [
@ -140,6 +150,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "master-us-test-1c",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/mixedinstances.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [
@ -190,6 +205,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "nodes",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/mixedinstances.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [

24
tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf
View File

@ -121,6 +121,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-mixedinstances-examp
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/mixedinstances.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -156,6 +162,12 @@ resource "aws_autoscaling_group" "master-us-test-1b-masters-mixedinstances-examp
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/mixedinstances.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -191,6 +203,12 @@ resource "aws_autoscaling_group" "master-us-test-1c-masters-mixedinstances-examp
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/mixedinstances.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -253,6 +271,12 @@ resource "aws_autoscaling_group" "nodes-mixedinstances-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/mixedinstances.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}

10
tests/integration/update_cluster/nosshkey-cloudformation/cloudformation.json
View File

@ -34,6 +34,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "master-us-test-1a",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/nosshkey.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [
@ -87,6 +92,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "nodes",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/nosshkey.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [

12
tests/integration/update_cluster/nosshkey/kubernetes.tf
View File

@ -128,6 +128,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-nosshkey-example-com
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/nosshkey.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -175,6 +181,12 @@ resource "aws_autoscaling_group" "nodes-nosshkey-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/nosshkey.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
suspended_processes = ["AZRebalance"]

18
tests/integration/update_cluster/private-shared-subnet/kubernetes.tf
View File

@ -141,6 +141,12 @@ resource "aws_autoscaling_group" "bastion-private-shared-subnet-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/private-shared-subnet.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -176,6 +182,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-private-shared-subne
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/private-shared-subnet.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -211,6 +223,12 @@ resource "aws_autoscaling_group" "nodes-private-shared-subnet-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/private-shared-subnet.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}

15
tests/integration/update_cluster/privatecalico/cloudformation.json
View File

@ -34,6 +34,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "bastion",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/privatecalico.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [
@ -92,6 +97,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "master-us-test-1a",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/privatecalico.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [
@ -150,6 +160,11 @@
"Key": "kops.k8s.io/instancegroup",
"Value": "nodes",
"PropagateAtLaunch": true
},
{
"Key": "kubernetes.io/cluster/privatecalico.example.com",
"Value": "owned",
"PropagateAtLaunch": true
}
],
"MetricsCollection": [

18
tests/integration/update_cluster/privatecalico/kubernetes.tf
View File

@ -151,6 +151,12 @@ resource "aws_autoscaling_group" "bastion-privatecalico-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/privatecalico.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -186,6 +192,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-privatecalico-exampl
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/privatecalico.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -221,6 +233,12 @@ resource "aws_autoscaling_group" "nodes-privatecalico-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/privatecalico.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}

18
tests/integration/update_cluster/privatecanal/kubernetes.tf
View File

@ -151,6 +151,12 @@ resource "aws_autoscaling_group" "bastion-privatecanal-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/privatecanal.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -186,6 +192,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-privatecanal-example
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/privatecanal.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -221,6 +233,12 @@ resource "aws_autoscaling_group" "nodes-privatecanal-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/privatecanal.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}

18
tests/integration/update_cluster/privatedns1/kubernetes.tf
View File

@ -151,6 +151,12 @@ resource "aws_autoscaling_group" "bastion-privatedns1-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/privatedns1.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -186,6 +192,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-privatedns1-example-
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/privatedns1.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -221,6 +233,12 @@ resource "aws_autoscaling_group" "nodes-privatedns1-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/privatedns1.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}

18
tests/integration/update_cluster/privatedns2/kubernetes.tf
View File

@ -146,6 +146,12 @@ resource "aws_autoscaling_group" "bastion-privatedns2-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/privatedns2.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -181,6 +187,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-privatedns2-example-
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/privatedns2.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -216,6 +228,12 @@ resource "aws_autoscaling_group" "nodes-privatedns2-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/privatedns2.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}

18
tests/integration/update_cluster/privateflannel/kubernetes.tf
View File

@ -151,6 +151,12 @@ resource "aws_autoscaling_group" "bastion-privateflannel-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/privateflannel.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -186,6 +192,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-privateflannel-examp
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/privateflannel.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -221,6 +233,12 @@ resource "aws_autoscaling_group" "nodes-privateflannel-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/privateflannel.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}

18
tests/integration/update_cluster/privatekopeio/kubernetes.tf
View File

@ -166,6 +166,12 @@ resource "aws_autoscaling_group" "bastion-privatekopeio-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/privatekopeio.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -201,6 +207,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-privatekopeio-exampl
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/privatekopeio.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -236,6 +248,12 @@ resource "aws_autoscaling_group" "nodes-privatekopeio-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/privatekopeio.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}

18
tests/integration/update_cluster/privateweave/kubernetes.tf
View File

@ -151,6 +151,12 @@ resource "aws_autoscaling_group" "bastion-privateweave-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/privateweave.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -186,6 +192,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-privateweave-example
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/privateweave.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -221,6 +233,12 @@ resource "aws_autoscaling_group" "nodes-privateweave-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/privateweave.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}

12
tests/integration/update_cluster/restrict_access/kubernetes.tf
View File

@ -111,6 +111,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-restrictaccess-examp
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/restrictaccess.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -146,6 +152,12 @@ resource "aws_autoscaling_group" "nodes-restrictaccess-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/restrictaccess.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}

12
tests/integration/update_cluster/shared_subnet/kubernetes.tf
View File

@ -106,6 +106,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-sharedsubnet-example
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/sharedsubnet.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -141,6 +147,12 @@ resource "aws_autoscaling_group" "nodes-sharedsubnet-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/sharedsubnet.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}

12
tests/integration/update_cluster/shared_vpc/kubernetes.tf
View File

@ -106,6 +106,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-sharedvpc-example-co
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/sharedvpc.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -141,6 +147,12 @@ resource "aws_autoscaling_group" "nodes-sharedvpc-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/sharedvpc.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}

18
tests/integration/update_cluster/unmanaged/kubernetes.tf
View File

@ -146,6 +146,12 @@ resource "aws_autoscaling_group" "bastion-unmanaged-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/unmanaged.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -181,6 +187,12 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-unmanaged-example-co
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/unmanaged.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
@ -216,6 +228,12 @@ resource "aws_autoscaling_group" "nodes-unmanaged-example-com" {
propagate_at_launch = true
}
tag = {
key = "kubernetes.io/cluster/unmanaged.example.com"
value = "owned"
propagate_at_launch = true
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}