Skip to content

Commit 011ab0f

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #17141 from rifelpet/nth-asg-tag
Only set NTH ManagedASGTag label if it doesn't already exist
2 parents d7fd342 + 4c5ee60 commit 011ab0f

7 files changed

+11
-20
lines changed

‎pkg/model/context.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,10 @@ func (b *KopsModelContext) CloudTagsForInstanceGroup(ig *kops.InstanceGroup) (ma
161161
// Apply NTH Labels
162162
nth := b.Cluster.Spec.CloudProvider.AWS.NodeTerminationHandler
163163
if nth.IsQueueMode() {
164-
labels[fi.ValueOf(nth.ManagedASGTag)] = ""
164+
k := fi.ValueOf(nth.ManagedASGTag)
165+
if _, ok := labels[k]; !ok && k != "" {
166+
labels[k] = ""
167+
}
165168
}
166169
}
167170

‎tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content

+1-1
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ spec:
235235
enableSpotInterruptionDraining: true
236236
enabled: true
237237
excludeFromLoadBalancers: true
238-
managedASGTag: aws-node-termination-handler/managed
238+
managedASGTag: kubernetes.io/cluster/complex.example.com
239239
memoryRequest: 64Mi
240240
podTerminationGracePeriod: -1
241241
prometheusEnable: false

‎tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
version: 9.99.0
4242
- id: k8s-1.11
4343
manifest: node-termination-handler.aws/k8s-1.11.yaml
44-
manifestHash: 93627ba43aa9bca83bd85005d328f2b42c28a9cf0cad1c03375fa4e33d59a877
44+
manifestHash: 565c78752a2216a5bef8c63aff4fe1435e054689f565f587b375c593b346a411
4545
name: node-termination-handler.aws
4646
prune:
4747
kinds:

‎tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-node-termination-handler.aws-k8s-1.11_content

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ spec:
176176
- name: CHECK_TAG_BEFORE_DRAINING
177177
value: "true"
178178
- name: MANAGED_TAG
179-
value: aws-node-termination-handler/managed
179+
value: kubernetes.io/cluster/complex.example.com
180180
- name: USE_PROVIDER_ID
181181
value: "true"
182182
- name: DRY_RUN

‎tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ spec:
6767
kubernetesVersion: v1.30.0
6868
masterPublicName: api.complex.example.com
6969
networkCIDR: 172.20.0.0/16
70+
nodeTerminationHandler:
71+
managedASGTag: kubernetes.io/cluster/complex.example.com
7072
additionalNetworkCIDRs:
7173
- 10.1.0.0/16
7274
- 10.2.0.0/16

‎tests/integration/update_cluster/complex/in-v1alpha2.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ spec:
6767
kubernetesVersion: v1.30.0
6868
masterPublicName: api.complex.example.com
6969
networkCIDR: 172.20.0.0/16
70+
nodeTerminationHandler:
71+
managedASGTag: kubernetes.io/cluster/complex.example.com
7072
additionalNetworkCIDRs:
7173
- 10.1.0.0/16
7274
- 10.2.0.0/16

‎tests/integration/update_cluster/complex/kubernetes.tf

-16
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,6 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-complex-example-com"
140140
propagate_at_launch = true
141141
value = "John Doe"
142142
}
143-
tag {
144-
key = "aws-node-termination-handler/managed"
145-
propagate_at_launch = true
146-
value = ""
147-
}
148143
tag {
149144
key = "foo/bar"
150145
propagate_at_launch = true
@@ -218,11 +213,6 @@ resource "aws_autoscaling_group" "nodes-complex-example-com" {
218213
propagate_at_launch = true
219214
value = "John Doe"
220215
}
221-
tag {
222-
key = "aws-node-termination-handler/managed"
223-
propagate_at_launch = true
224-
value = ""
225-
}
226216
tag {
227217
key = "foo/bar"
228218
propagate_at_launch = true
@@ -493,7 +483,6 @@ resource "aws_launch_template" "master-us-test-1a-masters-complex-example-com" {
493483
"KubernetesCluster" = "complex.example.com"
494484
"Name" = "master-us-test-1a.masters.complex.example.com"
495485
"Owner" = "John Doe"
496-
"aws-node-termination-handler/managed" = ""
497486
"foo/bar" = "fib+baz"
498487
"k8s.io/cluster-autoscaler/node-template/label/kops.k8s.io/kops-controller-pki" = ""
499488
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/control-plane" = ""
@@ -510,7 +499,6 @@ resource "aws_launch_template" "master-us-test-1a-masters-complex-example-com" {
510499
"KubernetesCluster" = "complex.example.com"
511500
"Name" = "master-us-test-1a.masters.complex.example.com"
512501
"Owner" = "John Doe"
513-
"aws-node-termination-handler/managed" = ""
514502
"foo/bar" = "fib+baz"
515503
"k8s.io/cluster-autoscaler/node-template/label/kops.k8s.io/kops-controller-pki" = ""
516504
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/control-plane" = ""
@@ -525,7 +513,6 @@ resource "aws_launch_template" "master-us-test-1a-masters-complex-example-com" {
525513
"KubernetesCluster" = "complex.example.com"
526514
"Name" = "master-us-test-1a.masters.complex.example.com"
527515
"Owner" = "John Doe"
528-
"aws-node-termination-handler/managed" = ""
529516
"foo/bar" = "fib+baz"
530517
"k8s.io/cluster-autoscaler/node-template/label/kops.k8s.io/kops-controller-pki" = ""
531518
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/control-plane" = ""
@@ -593,7 +580,6 @@ resource "aws_launch_template" "nodes-complex-example-com" {
593580
"KubernetesCluster" = "complex.example.com"
594581
"Name" = "nodes.complex.example.com"
595582
"Owner" = "John Doe"
596-
"aws-node-termination-handler/managed" = ""
597583
"foo/bar" = "fib+baz"
598584
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
599585
"k8s.io/role/node" = "1"
@@ -607,7 +593,6 @@ resource "aws_launch_template" "nodes-complex-example-com" {
607593
"KubernetesCluster" = "complex.example.com"
608594
"Name" = "nodes.complex.example.com"
609595
"Owner" = "John Doe"
610-
"aws-node-termination-handler/managed" = ""
611596
"foo/bar" = "fib+baz"
612597
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
613598
"k8s.io/role/node" = "1"
@@ -619,7 +604,6 @@ resource "aws_launch_template" "nodes-complex-example-com" {
619604
"KubernetesCluster" = "complex.example.com"
620605
"Name" = "nodes.complex.example.com"
621606
"Owner" = "John Doe"
622-
"aws-node-termination-handler/managed" = ""
623607
"foo/bar" = "fib+baz"
624608
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
625609
"k8s.io/role/node" = "1"

0 commit comments

Comments
 (0)