Skip to content

[cc-shoots-compute] Add support for in-place update strategy for workers #12772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
toanju wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[cc-shoots-compute] Add support for in-place update strategy for workers #12772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion system/cc-shoots-compute/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: cc-shoots-compute
description: Converged Cloud Gardener shoots
type: application
version: 2.6.9
version: 2.7.0
appVersion: "0.1.0"
14 changes: 9 additions & 5 deletions system/cc-shoots-compute/templates/kvm-shoot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ spec:
workers:
{{- range $workerkey, $worker := $cluster.workers }}
{{- $workerChannel := coalesce $worker.channel $cluster.channel "release" }}
{{- $updateStrategy := coalesce $worker.updateStrategy $cluster.updateStrategy $.Values.defaultUpdateStrategy }}
{{- $imageVersion:= "unset" }}
{{- if eq $workerChannel "preRelease" }}
{{- $imageVersion = coalesce $worker.preReleaseImageVersion $cluster.preReleaseImageVersion $.Values.preReleaseImageVersion }}
Expand All @@ -183,20 +184,23 @@ spec:
type: baremetal
minimum: {{ $worker.poolSize }}
maximum: {{ $worker.poolSize }}
{{- if not (has $updateStrategy (list "ManualInPlaceUpdate" "AutoInPlaceUpdate")) }}
maxSurge: {{ $worker.maxSurge | default 0 }}
maxUnavailable: {{ default 1 $worker.maxUnavailable }}
{{- if $worker.updateStrategy }}
updateStrategy: {{ $worker.updateStrategy }}
{{- end }}
updateStrategy: {{ $updateStrategy }}
zones:
{{- toYaml $worker.zones | nindent 8 }}
machineControllerManager:
{{- if eq $updateStrategy "AutoRollingUpdate" }}
machineCreationTimeout: {{ coalesce $worker.machineCreationTimeout $cluster.machineCreationTimeout "1h20m0s" }}
machineHealthTimeout: {{ coalesce $worker.machineHealthTimeout $cluster.machineHealthTimeout "1h0m0s" }}
machineDrainTimeout: {{ coalesce $worker.machineDrainTimeout $cluster.machineDrainTimeout "240h0m0s" }}
{{- if $worker.inPlaceUpdateTimeout }}
inPlaceUpdateTimeout: {{ $worker.inPlaceUpdateTimeout }}
{{- end }}
{{- else if has $updateStrategy (list "ManualInPlaceUpdate" "AutoInPlaceUpdate") }}
inPlaceUpdateTimeout: {{coalesce $worker.inPlaceUpdateTimeout $cluster.inPlaceUpdateTimeout "1h20m0s" }}
{{- else }}
{{- fail (printf "worker %s has invalid updateStrategy '%s': must be either 'AutoRollingUpdate', 'ManualInPlaceUpdate' or 'AutoInPlaceUpdate'" $workerkey $updateStrategy) }}
{{- end }}
sysctls:
vm.hugetlb_shm_group: "64055"
vm.unprivileged_userfaultfd: "1"
Expand Down
1 change: 1 addition & 0 deletions system/cc-shoots-compute/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
defaultUpdateStrategy: AutoRollingUpdate
authenticationConfig: {}
kvmShoot: false
networking:
Expand Down
Loading