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

FIX: Set default version into `model/components/nodeterminationhandler.go`

This commit is contained in:
Anthony Hausman 2022-03-23 11:56:38 +01:00
parent 308a886557
commit 2b589d5914
No known key found for this signature in database
GPG Key ID: F0A2DFA2FF1D34D0
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/model/components/nodeterminationhandler.go
View File

@ -74,5 +74,9 @@ func (b *NodeTerminationHandlerOptionsBuilder) BuildOptions(o interface{}) error
nth.MemoryRequest = &defaultMemoryRequest nth.MemoryRequest = &defaultMemoryRequest
} }
if nth.Version == nil {
nth.Version = fi.String("v1.14.0")
}
return nil return nil
} }

10
upup/models/cloudup/resources/addons/node-termination-handler.aws/k8s-1.11.yaml.template
View File

@ -11,7 +11,7 @@ metadata:
app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/instance: aws-node-termination-handler app.kubernetes.io/instance: aws-node-termination-handler
k8s-app: 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 # Source: aws-node-termination-handler/templates/clusterrole.yaml
kind: ClusterRole kind: ClusterRole
@ -79,7 +79,7 @@ metadata:
app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/instance: aws-node-termination-handler app.kubernetes.io/instance: aws-node-termination-handler
k8s-app: 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: spec:
replicas: 1 replicas: 1
selector: selector:
@ -118,7 +118,7 @@ spec:
fsGroup: 1000 fsGroup: 1000
containers: containers:
- name: aws-node-termination-handler - 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 imagePullPolicy: IfNotPresent
securityContext: securityContext:
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
@ -227,7 +227,7 @@ metadata:
app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/instance: aws-node-termination-handler app.kubernetes.io/instance: aws-node-termination-handler
k8s-app: 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: spec:
updateStrategy: updateStrategy:
rollingUpdate: rollingUpdate:
@ -271,7 +271,7 @@ spec:
dnsPolicy: "ClusterFirstWithHostNet" dnsPolicy: "ClusterFirstWithHostNet"
containers: containers:
- name: aws-node-termination-handler - 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 imagePullPolicy: IfNotPresent
securityContext: securityContext:
readOnlyRootFilesystem: true readOnlyRootFilesystem: true