Merge pull request #13405 from anthonyhaussman/feat/tone/set_version_pin_aws-node-termination

AWS-NODE-TERMINATION: Add possibility to set a tune image version
2022-03-24 00:56:41 -07:00 · 2022-03-24 00:56:41 -07:00 · 6844934e1a
parent 81b0ce3fc9 e8dcb67a1f
commit 6844934e1a
26 changed files with 57 additions and 20 deletions
--- a/k8s/crds/kops.k8s.io_clusters.yaml
+++ b/k8s/crds/kops.k8s.io_clusters.yaml
@ -5250,6 +5250,9 @@ spec:
                  prometheusEnable:
                    description: EnablePrometheusMetrics enables the "/metrics" endpoint.
                    type: boolean
+                  version:
+                    description: Version is the container image tag used.
+                    type: string
                type: object
              nonMasqueradeCIDR:
                description: MasterIPRange                 string `json:",omitempty"`
--- a/pkg/apis/kops/componentconfig.go
+++ b/pkg/apis/kops/componentconfig.go
@ -939,6 +939,8 @@ type NodeTerminationHandlerConfig struct {
 	// CPURequest of NodeTerminationHandler container.
 	// Default: 50m
 	CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
+	// Version is the container image tag used.
+	Version *string `json:"version,omitempty"`
 }

 // NodeProblemDetector determines the node problem detector configuration.
--- a/pkg/apis/kops/v1alpha2/componentconfig.go
+++ b/pkg/apis/kops/v1alpha2/componentconfig.go
@ -959,6 +959,8 @@ type NodeTerminationHandlerConfig struct {
 	// CPURequest of NodeTerminationHandler container.
 	// Default: 50m
 	CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
+	// Version is the container image tag used.
+	Version *string `json:"version,omitempty"`
 }

 // NodeProblemDetector determines the node problem detector configuration.
--- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go
+++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go
@ -6375,6 +6375,7 @@ func autoConvert_v1alpha2_NodeTerminationHandlerConfig_To_kops_NodeTerminationHa
 	out.ManagedASGTag = in.ManagedASGTag
 	out.MemoryRequest = in.MemoryRequest
 	out.CPURequest = in.CPURequest
+	out.Version = in.Version
 	return nil
 }

@ -6394,6 +6395,7 @@ func autoConvert_kops_NodeTerminationHandlerConfig_To_v1alpha2_NodeTerminationHa
 	out.ManagedASGTag = in.ManagedASGTag
 	out.MemoryRequest = in.MemoryRequest
 	out.CPURequest = in.CPURequest
+	out.Version = in.Version
 	return nil
 }

--- a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
+++ b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
@ -4427,6 +4427,11 @@ func (in *NodeTerminationHandlerConfig) DeepCopyInto(out *NodeTerminationHandler
 		x := (*in).DeepCopy()
 		*out = &x
 	}
+	if in.Version != nil {
+		in, out := &in.Version, &out.Version
+		*out = new(string)
+		**out = **in
+	}
 	return
 }

--- a/pkg/apis/kops/v1alpha3/componentconfig.go
+++ b/pkg/apis/kops/v1alpha3/componentconfig.go
@ -936,6 +936,8 @@ type NodeTerminationHandlerConfig struct {
 	// CPURequest of NodeTerminationHandler container.
 	// Default: 50m
 	CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
+	// Version is the container image tag used.
+	Version *string `json:"version,omitempty"`
 }

 // NodeProblemDetector determines the node problem detector configuration.
--- a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go
+++ b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go
@ -6368,6 +6368,7 @@ func autoConvert_v1alpha3_NodeTerminationHandlerConfig_To_kops_NodeTerminationHa
 	out.ManagedASGTag = in.ManagedASGTag
 	out.MemoryRequest = in.MemoryRequest
 	out.CPURequest = in.CPURequest
+	out.Version = in.Version
 	return nil
 }

@ -6387,6 +6388,7 @@ func autoConvert_kops_NodeTerminationHandlerConfig_To_v1alpha3_NodeTerminationHa
 	out.ManagedASGTag = in.ManagedASGTag
 	out.MemoryRequest = in.MemoryRequest
 	out.CPURequest = in.CPURequest
+	out.Version = in.Version
 	return nil
 }

--- a/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go
+++ b/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go
@ -4358,6 +4358,11 @@ func (in *NodeTerminationHandlerConfig) DeepCopyInto(out *NodeTerminationHandler
 		x := (*in).DeepCopy()
 		*out = &x
 	}
+	if in.Version != nil {
+		in, out := &in.Version, &out.Version
+		*out = new(string)
+		**out = **in
+	}
 	return
 }

--- a/pkg/apis/kops/zz_generated.deepcopy.go
+++ b/pkg/apis/kops/zz_generated.deepcopy.go
@ -4633,6 +4633,11 @@ func (in *NodeTerminationHandlerConfig) DeepCopyInto(out *NodeTerminationHandler
 		x := (*in).DeepCopy()
 		*out = &x
 	}
+	if in.Version != nil {
+		in, out := &in.Version, &out.Version
+		*out = new(string)
+		**out = **in
+	}
 	return
 }

--- a/pkg/model/components/nodeterminationhandler.go
+++ b/pkg/model/components/nodeterminationhandler.go
@ -74,5 +74,9 @@ func (b *NodeTerminationHandlerOptionsBuilder) BuildOptions(o interface{}) error
 		nth.MemoryRequest = &defaultMemoryRequest
 	}

+	if nth.Version == nil {
+		nth.Version = fi.String("v1.14.0")
+	}
+
 	return nil
 }
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content
@ -215,6 +215,7 @@ spec:
    managedASGTag: aws-node-termination-handler/managed
    memoryRequest: 64Mi
    prometheusEnable: false
+    version: v1.14.0
  nonMasqueradeCIDR: 172.20.0.0/16
  podCIDR: 172.20.128.0/17
  secretStore: memfs://clusters.example.com/minimal.example.com/secrets
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
@ -60,7 +60,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.11
    manifest: node-termination-handler.aws/k8s-1.11.yaml
-    manifestHash: 263c1e815b72472dcd22a35e3edd0529d2d94d9a537f031ae4fe90772c5e5c03
+    manifestHash: b0be9a82a9215b10ce4aefa09589e86d754b7484722db7488a8cf3bbaa2ccc3f
    name: node-termination-handler.aws
    prune:
      kinds:
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
@ -7,7 +7,7 @@ metadata:
    app.kubernetes.io/instance: aws-node-termination-handler
    app.kubernetes.io/managed-by: kops
    app.kubernetes.io/name: aws-node-termination-handler
-    app.kubernetes.io/version: 1.14.0
+    app.kubernetes.io/version: v1.14.0
    k8s-addon: node-termination-handler.aws
    k8s-app: aws-node-termination-handler
  name: aws-node-termination-handler
@ -91,7 +91,7 @@ metadata:
    app.kubernetes.io/instance: aws-node-termination-handler
    app.kubernetes.io/managed-by: kops
    app.kubernetes.io/name: aws-node-termination-handler
-    app.kubernetes.io/version: 1.14.0
+    app.kubernetes.io/version: v1.14.0
    k8s-addon: node-termination-handler.aws
    k8s-app: aws-node-termination-handler
  name: aws-node-termination-handler
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_cluster-completed.spec_content
@ -217,6 +217,7 @@ spec:
    managedASGTag: aws-node-termination-handler/managed
    memoryRequest: 64Mi
    prometheusEnable: false
+    version: v1.14.0
  nonMasqueradeCIDR: 172.20.0.0/16
  podCIDR: 172.20.128.0/17
  secretStore: memfs://clusters.example.com/minimal.example.com/secrets
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
@ -67,7 +67,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.11
    manifest: node-termination-handler.aws/k8s-1.11.yaml
-    manifestHash: 263c1e815b72472dcd22a35e3edd0529d2d94d9a537f031ae4fe90772c5e5c03
+    manifestHash: b0be9a82a9215b10ce4aefa09589e86d754b7484722db7488a8cf3bbaa2ccc3f
    name: node-termination-handler.aws
    prune:
      kinds:
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
@ -7,7 +7,7 @@ metadata:
    app.kubernetes.io/instance: aws-node-termination-handler
    app.kubernetes.io/managed-by: kops
    app.kubernetes.io/name: aws-node-termination-handler
-    app.kubernetes.io/version: 1.14.0
+    app.kubernetes.io/version: v1.14.0
    k8s-addon: node-termination-handler.aws
    k8s-app: aws-node-termination-handler
  name: aws-node-termination-handler
@ -91,7 +91,7 @@ metadata:
    app.kubernetes.io/instance: aws-node-termination-handler
    app.kubernetes.io/managed-by: kops
    app.kubernetes.io/name: aws-node-termination-handler
-    app.kubernetes.io/version: 1.14.0
+    app.kubernetes.io/version: v1.14.0
    k8s-addon: node-termination-handler.aws
    k8s-app: aws-node-termination-handler
  name: aws-node-termination-handler
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content
@ -214,6 +214,7 @@ spec:
    managedASGTag: aws-node-termination-handler/managed
    memoryRequest: 64Mi
    prometheusEnable: false
+    version: v1.14.0
  nonMasqueradeCIDR: 172.20.0.0/16
  podCIDR: 172.20.128.0/17
  secretStore: memfs://clusters.example.com/minimal.example.com/secrets
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
@ -60,7 +60,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.11
    manifest: node-termination-handler.aws/k8s-1.11.yaml
-    manifestHash: 9b8cb680850a38ff8b73c49ffc2e864b832e7458f4e93db8dd204a7cf4b19a67
+    manifestHash: bbdad2ac50bd56f8e8c0333fa0e26cea5434fc6621ba981b239ed52f62be2cee
    name: node-termination-handler.aws
    prune:
      kinds:
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
@ -7,7 +7,7 @@ metadata:
    app.kubernetes.io/instance: aws-node-termination-handler
    app.kubernetes.io/managed-by: kops
    app.kubernetes.io/name: aws-node-termination-handler
-    app.kubernetes.io/version: 1.14.0
+    app.kubernetes.io/version: v1.14.0
    k8s-addon: node-termination-handler.aws
    k8s-app: aws-node-termination-handler
  name: aws-node-termination-handler
@ -91,7 +91,7 @@ metadata:
    app.kubernetes.io/instance: aws-node-termination-handler
    app.kubernetes.io/managed-by: kops
    app.kubernetes.io/name: aws-node-termination-handler
-    app.kubernetes.io/version: 1.14.0
+    app.kubernetes.io/version: v1.14.0
    k8s-addon: node-termination-handler.aws
    k8s-app: aws-node-termination-handler
  name: aws-node-termination-handler
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content
@ -205,6 +205,7 @@ spec:
    managedASGTag: aws-node-termination-handler/managed
    memoryRequest: 64Mi
    prometheusEnable: false
+    version: v1.14.0
  nonMasqueradeCIDR: 172.20.0.0/16
  podCIDR: 172.20.128.0/17
  secretStore: memfs://clusters.example.com/minimal.example.com/secrets
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
@ -60,7 +60,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.11
    manifest: node-termination-handler.aws/k8s-1.11.yaml
-    manifestHash: 9b8cb680850a38ff8b73c49ffc2e864b832e7458f4e93db8dd204a7cf4b19a67
+    manifestHash: bbdad2ac50bd56f8e8c0333fa0e26cea5434fc6621ba981b239ed52f62be2cee
    name: node-termination-handler.aws
    prune:
      kinds:
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
@ -7,7 +7,7 @@ metadata:
    app.kubernetes.io/instance: aws-node-termination-handler
    app.kubernetes.io/managed-by: kops
    app.kubernetes.io/name: aws-node-termination-handler
-    app.kubernetes.io/version: 1.14.0
+    app.kubernetes.io/version: v1.14.0
    k8s-addon: node-termination-handler.aws
    k8s-app: aws-node-termination-handler
  name: aws-node-termination-handler
@ -91,7 +91,7 @@ metadata:
    app.kubernetes.io/instance: aws-node-termination-handler
    app.kubernetes.io/managed-by: kops
    app.kubernetes.io/name: aws-node-termination-handler
-    app.kubernetes.io/version: 1.14.0
+    app.kubernetes.io/version: v1.14.0
    k8s-addon: node-termination-handler.aws
    k8s-app: aws-node-termination-handler
  name: aws-node-termination-handler
--- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content
@ -170,6 +170,7 @@ spec:
    managedASGTag: aws-node-termination-handler/managed
    memoryRequest: 64Mi
    prometheusEnable: false
+    version: v1.14.0
  nonMasqueradeCIDR: 100.64.0.0/10
  podCIDR: 100.96.0.0/11
  secretStore: memfs://clusters.example.com/nthsqsresources.longclustername.example.com/secrets
--- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-bootstrap_content
@ -47,7 +47,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.11
    manifest: node-termination-handler.aws/k8s-1.11.yaml
-    manifestHash: 10d08b366893f1f11be9b722fd862b510c4aa8e66c1b89345d46a141cf2286ed
+    manifestHash: 99a2738356bc31978f60b253f83eeea29dd1d868b5b0203ef86d4c52dc4b45bc
    name: node-termination-handler.aws
    prune:
      kinds:
--- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-node-termination-handler.aws-k8s-1.11_content
+++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-node-termination-handler.aws-k8s-1.11_content
@ -7,7 +7,7 @@ metadata:
    app.kubernetes.io/instance: aws-node-termination-handler
    app.kubernetes.io/managed-by: kops
    app.kubernetes.io/name: aws-node-termination-handler
-    app.kubernetes.io/version: 1.14.0
+    app.kubernetes.io/version: v1.14.0
    k8s-addon: node-termination-handler.aws
    k8s-app: aws-node-termination-handler
  name: aws-node-termination-handler
@ -91,7 +91,7 @@ metadata:
    app.kubernetes.io/instance: aws-node-termination-handler
    app.kubernetes.io/managed-by: kops
    app.kubernetes.io/name: aws-node-termination-handler
-    app.kubernetes.io/version: 1.14.0
+    app.kubernetes.io/version: v1.14.0
    k8s-addon: node-termination-handler.aws
    k8s-app: aws-node-termination-handler
  name: aws-node-termination-handler
--- a/upup/models/cloudup/resources/addons/node-termination-handler.aws/k8s-1.11.yaml.template
+++ b/upup/models/cloudup/resources/addons/node-termination-handler.aws/k8s-1.11.yaml.template
@ -11,7 +11,7 @@ metadata:
    app.kubernetes.io/name: aws-node-termination-handler
    app.kubernetes.io/instance: aws-node-termination-handler
    k8s-app: aws-node-termination-handler
-    app.kubernetes.io/version: "1.14.0"
+    app.kubernetes.io/version: "{{ .Version }}"
 ---
 # Source: aws-node-termination-handler/templates/clusterrole.yaml
 kind: ClusterRole
@ -79,7 +79,7 @@ metadata:
    app.kubernetes.io/name: aws-node-termination-handler
    app.kubernetes.io/instance: aws-node-termination-handler
    k8s-app: aws-node-termination-handler
-    app.kubernetes.io/version: "1.14.0"
+    app.kubernetes.io/version: "{{ .Version }}"
 spec:
  replicas: 1
  selector:
@ -118,7 +118,7 @@ spec:
        fsGroup: 1000
      containers:
        - name: aws-node-termination-handler
-          image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.14.0
+          image: public.ecr.aws/aws-ec2/aws-node-termination-handler:{{ .Version }}
          imagePullPolicy: IfNotPresent
          securityContext:
            readOnlyRootFilesystem: true
@ -227,7 +227,7 @@ metadata:
    app.kubernetes.io/name: aws-node-termination-handler
    app.kubernetes.io/instance: aws-node-termination-handler
    k8s-app: aws-node-termination-handler
-    app.kubernetes.io/version: "1.14.0"
+    app.kubernetes.io/version: "{{ .Version }}"
 spec:
  updateStrategy:
    rollingUpdate:
@ -271,7 +271,7 @@ spec:
      dnsPolicy: "ClusterFirstWithHostNet"
      containers:
        - name: aws-node-termination-handler
-          image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.14.0
+          image: public.ecr.aws/aws-ec2/aws-node-termination-handler:{{ .Version }}
          imagePullPolicy: IfNotPresent
          securityContext:
            readOnlyRootFilesystem: true