From 4f0662032988a0c5e538b07c4a665b7651c952c1 Mon Sep 17 00:00:00 2001 From: Omar Pakker Date: Fri, 18 Aug 2023 13:29:19 +0200 Subject: [PATCH] [helm] Delete duplicate strategy key CI complained about duplicate strategy keys, failing the job. Turns out the deployment.yaml defined it at the PodSpec and DeploymentSpec. The PodSpec level strategy key has been removed (non-existant). The values.yaml had a 1-to-1 duplicate of the key default values, also removed. Signed-off-by: Omar Pakker --- helm/dendrite/templates/deployment.yaml | 9 +-------- helm/dendrite/values.yaml | 10 ---------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/helm/dendrite/templates/deployment.yaml b/helm/dendrite/templates/deployment.yaml index 3a0bd68d8..e3f84cdae 100644 --- a/helm/dendrite/templates/deployment.yaml +++ b/helm/dendrite/templates/deployment.yaml @@ -26,13 +26,6 @@ spec: annotations: confighash: secret-{{ .Values.dendrite_config | toYaml | sha256sum | trunc 32 }} spec: - strategy: - type: {{ $.Values.strategy.type }} - {{- if eq $.Values.strategy.type "RollingUpdate" }} - rollingUpdate: - maxSurge: {{ $.Values.strategy.rollingUpdate.maxSurge }} - maxUnavailable: {{ $.Values.strategy.rollingUpdate.maxUnavailable }} - {{- end }} volumes: - name: {{ include "dendrite.fullname" . }}-conf-vol secret: @@ -116,4 +109,4 @@ spec: failureThreshold: 10 httpGet: path: /_dendrite/monitor/up - port: http \ No newline at end of file + port: http diff --git a/helm/dendrite/values.yaml b/helm/dendrite/values.yaml index 396e70319..8a72f6693 100644 --- a/helm/dendrite/values.yaml +++ b/helm/dendrite/values.yaml @@ -65,16 +65,6 @@ extraVolumeMounts: [] # - mountPath: /etc/dendrite/extra-config # name: extra-config -strategy: - # -- Strategy to use for rolling updates (e.g. Recreate, RollingUpdate) - # If you are using ReadWriteOnce volumes, you should probably use Recreate - type: RollingUpdate - rollingUpdate: - # -- Maximum number of pods that can be unavailable during the update process - maxUnavailable: 25% - # -- Maximum number of pods that can be scheduled above the desired number of pods - maxSurge: 25% - strategy: # -- Strategy to use for rolling updates (e.g. Recreate, RollingUpdate) # If you are using ReadWriteOnce volumes, you should probably use Recreate