From 2b589d591460cc36ea0e9253c0fb82a4e3ce17d3 Mon Sep 17 00:00:00 2001
From: Anthony Hausman <anthony.hausman@backmarket.com>
Date: Wed, 23 Mar 2022 11:56:38 +0100
Subject: [PATCH] FIX: Set default version into
 `model/components/nodeterminationhandler.go`

---
 pkg/model/components/nodeterminationhandler.go         |  4 ++++
 .../k8s-1.11.yaml.template                             | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkg/model/components/nodeterminationhandler.go b/pkg/model/components/nodeterminationhandler.go
index ae8bc9f74d..a73da8681f 100644
--- 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
 }
diff --git 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
index 44d0900234..7149ba52fd 100644
--- 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: "{{ or .Version "v1.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: "{{ or .Version "v1.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:{{ or .Version "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: "{{ or .Version "v1.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:{{ or .Version "v1.14.0" }}
+          image: public.ecr.aws/aws-ec2/aws-node-termination-handler:{{ .Version }}
           imagePullPolicy: IfNotPresent
           securityContext:
             readOnlyRootFilesystem: true