From 66050bf677f92f82bd75610cafe7a08ac17a8b1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Fri, 1 Mar 2024 21:33:44 +0100 Subject: [PATCH] Make deploy.strategy configurable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan-Otto Kröpke --- helm/oauth2-proxy/Chart.yaml | 6 +++--- helm/oauth2-proxy/README.md | 1 + helm/oauth2-proxy/templates/deployment.yaml | 4 ++++ helm/oauth2-proxy/values.yaml | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/helm/oauth2-proxy/Chart.yaml b/helm/oauth2-proxy/Chart.yaml index 04c892e..0682fbe 100644 --- a/helm/oauth2-proxy/Chart.yaml +++ b/helm/oauth2-proxy/Chart.yaml @@ -1,5 +1,5 @@ name: oauth2-proxy -version: 7.0.0 +version: 7.1.0 apiVersion: v2 appVersion: 7.6.0 home: https://oauth2-proxy.github.io/oauth2-proxy/ @@ -35,7 +35,7 @@ kubeVersion: ">=1.9.0-0" annotations: artifacthub.io/changes: | - kind: added - description: Fix hostAliases to add multiple entries in /etc/hosts + description: Make deploy.strategy configurable links: - name: Github PR - url: https://github.com/oauth2-proxy/manifests/pull/164 + url: https://github.com/oauth2-proxy/manifests/pull/188 diff --git a/helm/oauth2-proxy/README.md b/helm/oauth2-proxy/README.md index f8d045c..f15464b 100644 --- a/helm/oauth2-proxy/README.md +++ b/helm/oauth2-proxy/README.md @@ -178,6 +178,7 @@ Parameter | Description | Default `serviceAccount.enabled` | create a service account | `true` `serviceAccount.name` | the service account name | `` `serviceAccount.annotations` | (optional) annotations for the service account | `{}` +`strategy` | configure deployment strategy | `{}` `tolerations` | list of node taints to tolerate | `[]` `securityContext.enabled` | enable Kubernetes security context on container | `true` `proxyVarsAsSecrets` | choose between environment values or secrets for setting up OAUTH2_PROXY variables. When set to false, remember to add the variables OAUTH2_PROXY_CLIENT_ID, OAUTH2_PROXY_CLIENT_SECRET, OAUTH2_PROXY_COOKIE_SECRET in extraEnv | `true` diff --git a/helm/oauth2-proxy/templates/deployment.yaml b/helm/oauth2-proxy/templates/deployment.yaml index 09ada8d..d4cbeb9 100644 --- a/helm/oauth2-proxy/templates/deployment.yaml +++ b/helm/oauth2-proxy/templates/deployment.yaml @@ -13,6 +13,10 @@ metadata: spec: replicas: {{ .Values.replicaCount }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- with .Values.strategy }} + strategy: + {{ toYaml . | nindent 4 }} + {{- end }} selector: matchLabels: {{- include "oauth2-proxy.selectorLabels" . | indent 6 }} diff --git a/helm/oauth2-proxy/values.yaml b/helm/oauth2-proxy/values.yaml index 21f89a2..219f45a 100644 --- a/helm/oauth2-proxy/values.yaml +++ b/helm/oauth2-proxy/values.yaml @@ -256,6 +256,7 @@ podAnnotations: {} podLabels: {} replicaCount: 1 revisionHistoryLimit: 10 +strategy: {} ## PodDisruptionBudget settings ## ref: https://kubernetes.io/docs/concepts/workloads/pods/disruptions/