From f9c30edf92fa9fb6128b5eb3fa04795e48a3aae5 Mon Sep 17 00:00:00 2001 From: Pierluigi Lenoci Date: Tue, 16 Jul 2024 14:41:49 +0200 Subject: [PATCH 1/5] Redis chart upgrade --- helm/oauth2-proxy/Chart.lock | 6 +++--- helm/oauth2-proxy/Chart.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/helm/oauth2-proxy/Chart.lock b/helm/oauth2-proxy/Chart.lock index 715d56c..a0377c0 100644 --- a/helm/oauth2-proxy/Chart.lock +++ b/helm/oauth2-proxy/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: redis repository: https://charts.bitnami.com/bitnami - version: 19.6.0 -digest: sha256:201700e51781c5a41ee4b275fbfa33fa13bd755354a35ab703c3cb3266e3f5c5 -generated: "2024-06-27T16:29:26.088834+02:00" + version: 19.6.1 +digest: sha256:f8e8c7b17de324c1ee1401bc973d985bbbcb75d30faa2f5317ab5f54d6899c0d +generated: "2024-07-16T14:41:03.616506+02:00" diff --git a/helm/oauth2-proxy/Chart.yaml b/helm/oauth2-proxy/Chart.yaml index 70b0053..2d70161 100644 --- a/helm/oauth2-proxy/Chart.yaml +++ b/helm/oauth2-proxy/Chart.yaml @@ -1,5 +1,5 @@ name: oauth2-proxy -version: 7.7.8 +version: 7.7.9 apiVersion: v2 appVersion: 7.6.0 home: https://oauth2-proxy.github.io/oauth2-proxy/ @@ -14,7 +14,7 @@ keywords: - redis dependencies: - name: redis - version: 19.6.0 + version: 19.6.1 repository: https://charts.bitnami.com/bitnami alias: redis condition: redis.enabled @@ -38,4 +38,4 @@ annotations: description: Updated the Redis chart to the latest version links: - name: Github PR - url: https://github.com/oauth2-proxy/manifests/pull/221 + url: https://github.com/oauth2-proxy/manifests/pull/223 From 3fc4d500d3e589942e98fe5c1ebde1257b4aba10 Mon Sep 17 00:00:00 2001 From: Garry O'Donnell Date: Thu, 18 Jul 2024 12:07:12 +0100 Subject: [PATCH 2/5] Template extraVolumes --- helm/oauth2-proxy/Chart.yaml | 2 +- helm/oauth2-proxy/ci/tpl-values.yaml | 8 ++++++++ helm/oauth2-proxy/templates/deployment.yaml | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/helm/oauth2-proxy/Chart.yaml b/helm/oauth2-proxy/Chart.yaml index 2d70161..eece163 100644 --- a/helm/oauth2-proxy/Chart.yaml +++ b/helm/oauth2-proxy/Chart.yaml @@ -1,5 +1,5 @@ name: oauth2-proxy -version: 7.7.9 +version: 7.7.10 apiVersion: v2 appVersion: 7.6.0 home: https://oauth2-proxy.github.io/oauth2-proxy/ diff --git a/helm/oauth2-proxy/ci/tpl-values.yaml b/helm/oauth2-proxy/ci/tpl-values.yaml index 65977d9..5b0adae 100644 --- a/helm/oauth2-proxy/ci/tpl-values.yaml +++ b/helm/oauth2-proxy/ci/tpl-values.yaml @@ -19,3 +19,11 @@ pass_authorization_header: "true" extraArgs: pass-authorization-header: "{{ $.Values.pass_authorization_header }}" + +extraVolumes: + - name: "{{ $.Release.Name }}-secret" + secret: + secretName: "{{ .Release.Name }}-secret" + items: + - key: secret + path: secret diff --git a/helm/oauth2-proxy/templates/deployment.yaml b/helm/oauth2-proxy/templates/deployment.yaml index 4870458..1a5340d 100644 --- a/helm/oauth2-proxy/templates/deployment.yaml +++ b/helm/oauth2-proxy/templates/deployment.yaml @@ -369,7 +369,7 @@ spec: {{- end }} {{- end }} {{- if ne (len .Values.extraVolumes) 0 }} -{{ toYaml .Values.extraVolumes | indent 6 }} +{{ tpl (toYaml .Values.extraVolumes) . | indent 6 }} {{- end }} {{- if and (.Values.authenticatedEmailsFile.enabled) (eq .Values.authenticatedEmailsFile.persistence "configmap") }} - configMap: From a51aa473b0527806a449f49923da680eea166eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Thu, 8 Aug 2024 15:58:12 +0200 Subject: [PATCH 3/5] [helm] Add global.imagePullSecrets --- helm/oauth2-proxy/Chart.yaml | 2 +- helm/oauth2-proxy/templates/deployment.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/helm/oauth2-proxy/Chart.yaml b/helm/oauth2-proxy/Chart.yaml index 2d70161..eece163 100644 --- a/helm/oauth2-proxy/Chart.yaml +++ b/helm/oauth2-proxy/Chart.yaml @@ -1,5 +1,5 @@ name: oauth2-proxy -version: 7.7.9 +version: 7.7.10 apiVersion: v2 appVersion: 7.6.0 home: https://oauth2-proxy.github.io/oauth2-proxy/ diff --git a/helm/oauth2-proxy/templates/deployment.yaml b/helm/oauth2-proxy/templates/deployment.yaml index 4870458..5129cd9 100644 --- a/helm/oauth2-proxy/templates/deployment.yaml +++ b/helm/oauth2-proxy/templates/deployment.yaml @@ -388,9 +388,9 @@ spec: name: configaccesslist {{- end }} - {{- if .Values.imagePullSecrets }} + {{- with (concat .Values.imagePullSecrets .Values.global.imagePullSecrets) }} imagePullSecrets: -{{ toYaml .Values.imagePullSecrets | indent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} {{- if .Values.affinity }} affinity: From b1b2c0151ea35f372b1f16d6edd4b2a85f5a8114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Thu, 8 Aug 2024 16:05:21 +0200 Subject: [PATCH 4/5] [helm] Add global.imagePullSecrets --- helm/oauth2-proxy/templates/deployment.yaml | 20 +++++++++++--------- helm/oauth2-proxy/values.yaml | 9 ++++++++- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/helm/oauth2-proxy/templates/deployment.yaml b/helm/oauth2-proxy/templates/deployment.yaml index 5129cd9..ca4b1c3 100644 --- a/helm/oauth2-proxy/templates/deployment.yaml +++ b/helm/oauth2-proxy/templates/deployment.yaml @@ -388,21 +388,23 @@ spec: name: configaccesslist {{- end }} - {{- with (concat .Values.imagePullSecrets .Values.global.imagePullSecrets) }} + {{- with (.Values.imagePullSecrets | default .Values.global.imagePullSecrets) }} imagePullSecrets: {{- toYaml . | nindent 8 }} - {{- end }} - {{- if .Values.affinity }} + {{- end }} + {{- with .Values.affinity }} affinity: -{{ toYaml .Values.affinity | indent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} - {{- if .Values.nodeSelector }} + {{- with .Values.nodeSelector }} nodeSelector: -{{ toYaml .Values.nodeSelector | indent 8 }} + {{ toYaml . | nindent 8 }} {{- end }} + {{- with .Values.tolerations }} tolerations: -{{ toYaml .Values.tolerations | indent 8 }} - {{- with .Values.topologySpreadConstraints }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.topologySpreadConstraints }} topologySpreadConstraints: {{- toYaml . | nindent 8 }} - {{- end }} + {{- end }} diff --git a/helm/oauth2-proxy/values.yaml b/helm/oauth2-proxy/values.yaml index 21f8083..d898743 100644 --- a/helm/oauth2-proxy/values.yaml +++ b/helm/oauth2-proxy/values.yaml @@ -1,3 +1,10 @@ +global: {} +# To help compatibility with other charts which use global.imagePullSecrets. +# global: +# imagePullSecrets: +# - name: pullSecret1 +# - name: pullSecret2 + ## Override the deployment namespace ## namespaceOverride: "" @@ -75,7 +82,7 @@ image: # Optionally specify an array of imagePullSecrets. # Secrets must be manually created in the namespace. # ref: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod -# imagePullSecrets: +imagePullSecrets: [] # - name: myRegistryKeySecretName # Set a custom containerPort if required. From ac78abb87f835b3628cb6106e93fb5843036738f Mon Sep 17 00:00:00 2001 From: Pierluigi Lenoci Date: Fri, 23 Aug 2024 13:07:46 +0200 Subject: [PATCH 5/5] Update Chart.yaml --- helm/oauth2-proxy/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/oauth2-proxy/Chart.yaml b/helm/oauth2-proxy/Chart.yaml index eece163..b60fb40 100644 --- a/helm/oauth2-proxy/Chart.yaml +++ b/helm/oauth2-proxy/Chart.yaml @@ -1,5 +1,5 @@ name: oauth2-proxy -version: 7.7.10 +version: 7.7.11 apiVersion: v2 appVersion: 7.6.0 home: https://oauth2-proxy.github.io/oauth2-proxy/