From d0553076ef4827749cc89036d3df93c5c4f3472b Mon Sep 17 00:00:00 2001 From: RadOctocode Date: Tue, 5 Mar 2024 12:02:06 -0500 Subject: [PATCH 1/2] removed v from version of oauth2-proxy deployment.yaml added minor version bump Signed-off-by: RadOctocode --- helm/oauth2-proxy/Chart.yaml | 8 ++++---- helm/oauth2-proxy/templates/_helpers.tpl | 2 +- helm/oauth2-proxy/templates/deployment.yaml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/helm/oauth2-proxy/Chart.yaml b/helm/oauth2-proxy/Chart.yaml index 0682fbe..ebba083 100644 --- a/helm/oauth2-proxy/Chart.yaml +++ b/helm/oauth2-proxy/Chart.yaml @@ -1,5 +1,5 @@ name: oauth2-proxy -version: 7.1.0 +version: 7.2.0 apiVersion: v2 appVersion: 7.6.0 home: https://oauth2-proxy.github.io/oauth2-proxy/ @@ -34,8 +34,8 @@ maintainers: kubeVersion: ">=1.9.0-0" annotations: artifacthub.io/changes: | - - kind: added - description: Make deploy.strategy configurable + - kind: changed + description: Remove the v from the oauth2-proxy deployment.yaml image links: - name: Github PR - url: https://github.com/oauth2-proxy/manifests/pull/188 + url: https://github.com/oauth2-proxy/manifests/pull/189 \ No newline at end of file diff --git a/helm/oauth2-proxy/templates/_helpers.tpl b/helm/oauth2-proxy/templates/_helpers.tpl index 9bf2cdd..6a9bbb3 100644 --- a/helm/oauth2-proxy/templates/_helpers.tpl +++ b/helm/oauth2-proxy/templates/_helpers.tpl @@ -117,7 +117,7 @@ Compute the redis url if not set explicitly. Returns the version */}} {{- define "oauth2-proxy.version" -}} -{{ trimPrefix "v" (lower (.Values.image.tag | default (printf "v%s" .Chart.AppVersion))) }} +{{ .Values.image.tag | default (printf "v%s" .Chart.AppVersion) }} {{- end -}} {{/* diff --git a/helm/oauth2-proxy/templates/deployment.yaml b/helm/oauth2-proxy/templates/deployment.yaml index d4cbeb9..218bef4 100644 --- a/helm/oauth2-proxy/templates/deployment.yaml +++ b/helm/oauth2-proxy/templates/deployment.yaml @@ -82,7 +82,7 @@ spec: {{- end }} containers: - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:v{{ include "oauth2-proxy.version" . }}" + image: "{{ .Values.image.repository }}:{{ include "oauth2-proxy.version" . }}" imagePullPolicy: {{ .Values.image.pullPolicy }} args: {{- if .Values.alphaConfig.enabled }} From e3d24dcb984e29c3185c42a744e5cecb1c0e0485 Mon Sep 17 00:00:00 2001 From: Pierluigi Lenoci Date: Thu, 21 Mar 2024 20:55:42 +0100 Subject: [PATCH 2/2] New line --- 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 ebba083..736212f 100644 --- a/helm/oauth2-proxy/Chart.yaml +++ b/helm/oauth2-proxy/Chart.yaml @@ -38,4 +38,4 @@ annotations: description: Remove the v from the oauth2-proxy deployment.yaml image links: - name: Github PR - url: https://github.com/oauth2-proxy/manifests/pull/189 \ No newline at end of file + url: https://github.com/oauth2-proxy/manifests/pull/189