From 617727d92c62171410b993b16d816961b0759e34 Mon Sep 17 00:00:00 2001 From: Jan Larwig Date: Sun, 17 Aug 2025 22:49:22 +0200 Subject: [PATCH 1/2] fix: redis-ha subchart deployment / service name in template helpers Signed-off-by: Jan Larwig --- helm/oauth2-proxy/ci/redis-standalone-values.yaml | 1 - helm/oauth2-proxy/templates/_helpers.tpl | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/helm/oauth2-proxy/ci/redis-standalone-values.yaml b/helm/oauth2-proxy/ci/redis-standalone-values.yaml index 880d587d..4876165c 100644 --- a/helm/oauth2-proxy/ci/redis-standalone-values.yaml +++ b/helm/oauth2-proxy/ci/redis-standalone-values.yaml @@ -7,7 +7,6 @@ sessionStorage: # provision an instance of the redis-ha sub-chart redis: enabled: true - fullnameOverride: oauth2-proxy-redis redisPassword: "foo" diff --git a/helm/oauth2-proxy/templates/_helpers.tpl b/helm/oauth2-proxy/templates/_helpers.tpl index 3eb1c0e3..73868de9 100644 --- a/helm/oauth2-proxy/templates/_helpers.tpl +++ b/helm/oauth2-proxy/templates/_helpers.tpl @@ -94,7 +94,7 @@ Redis subcharts fullname */}} {{- define "oauth2-proxy.redis.fullname" -}} {{- if .Values.redis.enabled -}} -{{- include "redis-ha.fullname" (dict "Chart" (dict "Name" "redis-ha") "Release" .Release "Values" .Values.redis) -}} +{{- include "redis-ha.fullname" (dict "Chart" (dict "Name" "redis") "Release" .Release "Values" .Values.redis) -}} {{- else -}} {{ fail "attempting to use redis subcharts fullname, even though the subchart is not enabled. This will lead to misconfiguration" }} {{- end -}} From aae009db16fa985c362417c86f307374fda43438 Mon Sep 17 00:00:00 2001 From: Jan Larwig Date: Sun, 17 Aug 2025 22:56:10 +0200 Subject: [PATCH 2/2] add changelog entry Signed-off-by: Jan Larwig --- helm/oauth2-proxy/Chart.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/helm/oauth2-proxy/Chart.yaml b/helm/oauth2-proxy/Chart.yaml index 1cdc7a9b..0f906101 100644 --- a/helm/oauth2-proxy/Chart.yaml +++ b/helm/oauth2-proxy/Chart.yaml @@ -1,5 +1,5 @@ name: oauth2-proxy -version: 8.0.0 +version: 8.0.1 apiVersion: v2 appVersion: 7.11.0 home: https://oauth2-proxy.github.io/oauth2-proxy/ @@ -31,8 +31,8 @@ maintainers: kubeVersion: ">=1.16.0-0" annotations: artifacthub.io/changes: | - - kind: changed - description: Replace Redis chart by bitnami with dandydeveloper/redis-ha chart + - kind: fixed + description: Fixes how the fullname for the deployment / service of the newly introduced redis-ha subchart is generated links: - name: Github PR - url: https://github.com/oauth2-proxy/manifests/pull/335 + url: https://github.com/oauth2-proxy/manifests/pull/338