Skip to content

Commit ed5054b

Browse files
committed
overwite maxSurge/maxUnavailable if seamlessUpgrades enabled + seamlessUpgrades enabled for e2e tests
1 parent ce936de commit ed5054b

2 files changed

Lines changed: 27 additions & 4 deletions

File tree

deployments/helm/dra-example-driver/templates/kubeletplugin.yaml

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,38 @@ spec:
1414
app.kubernetes.io/component: kubeletplugin
1515
{{- with .Values.kubeletPlugin.updateStrategy }}
1616
updateStrategy:
17+
{{- if $.Values.kubeletPlugin.seamlessUpgrades.enabled }}
18+
{{- $strategy := . }}
19+
{{- range $key, $value := . }}
20+
{{- if eq $key "rollingUpdate" }}
21+
{{ $key }}:
22+
maxSurge: 1
23+
maxUnavailable: 0
24+
{{- range $subkey, $subvalue := $value }}
25+
{{- if and (ne $subkey "maxSurge") (ne $subkey "maxUnavailable") }}
26+
{{ $subkey }}: {{ $subvalue }}
27+
{{- end }}
28+
{{- end }}
29+
{{- else }}
30+
{{ $key }}: {{ $value }}
31+
{{- end }}
32+
{{- end }}
33+
{{- else }}
1734
{{- toYaml . | nindent 4 }}
35+
{{- end }}
1836
{{- else }}
19-
{{- if .Values.kubeletPlugin.seamlessUpgrades.enabled }}
2037
updateStrategy:
21-
type: RollingUpdate
38+
type: {{ .Values.kubeletPlugin.updateStrategy.type | default "RollingUpdate" }}
39+
{{- if eq (.Values.kubeletPlugin.updateStrategy.type | default "RollingUpdate") "RollingUpdate" }}
2240
rollingUpdate:
41+
{{- if .Values.kubeletPlugin.seamlessUpgrades.enabled }}
2342
maxSurge: 1
2443
maxUnavailable: 0
25-
{{- end }}
44+
{{- else }}
45+
maxSurge: {{ .Values.kubeletPlugin.updateStrategy.rollingUpdate.maxSurge | default 0 }}
46+
maxUnavailable: {{ .Values.kubeletPlugin.updateStrategy.rollingUpdate.maxUnavailable | default 1 }}
47+
{{- end }}
48+
{{- end }}
2649
{{- end }}
2750
template:
2851
metadata:

deployments/helm/dra-example-driver/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ kubeletPlugin:
4848
numDevices: 8
4949
priorityClassName: "system-node-critical"
5050
seamlessUpgrades:
51-
enabled: false
51+
enabled: true
5252
updateStrategy:
5353
type: RollingUpdate
5454
podAnnotations: {}

0 commit comments

Comments
 (0)