diff --git a/helm/oauth2-proxy/Chart.yaml b/helm/oauth2-proxy/Chart.yaml index 393d930..4be7b22 100644 --- a/helm/oauth2-proxy/Chart.yaml +++ b/helm/oauth2-proxy/Chart.yaml @@ -1,5 +1,5 @@ name: oauth2-proxy -version: 7.5.3 +version: 7.5.4 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: changed - description: Redis parameters update in values + description: Wait for redis script fixes for cluster and sentinel links: - name: Github PR - url: https://github.com/oauth2-proxy/manifests/issues/202 + url: https://github.com/oauth2-proxy/manifests/issues/205 diff --git a/helm/oauth2-proxy/scripts/check-redis.sh b/helm/oauth2-proxy/scripts/check-redis.sh index 1785190..24e628f 100644 --- a/helm/oauth2-proxy/scripts/check-redis.sh +++ b/helm/oauth2-proxy/scripts/check-redis.sh @@ -31,12 +31,12 @@ parse_and_check() { } # Main -if [ "$OAUTH2_PROXY_REDIS_USE_CLUSTER" = "true" ]; then +if [ -n "$OAUTH2_PROXY_REDIS_CLUSTER_CONNECTION_URLS" ]; then echo "Checking Redis in cluster mode..." echo "$OAUTH2_PROXY_REDIS_CLUSTER_CONNECTION_URLS" | tr ',' '\n' | while read -r addr; do parse_and_check $addr || exit 1 done -elif [ "$OAUTH2_PROXY_REDIS_USE_SENTINEL" = "true" ]; then +elif [ -n "$OAUTH2_PROXY_REDIS_SENTINEL_CONNECTION_URLS" ]; then echo "Checking Redis in sentinel mode..." echo "$OAUTH2_PROXY_REDIS_SENTINEL_CONNECTION_URLS" | tr ',' '\n' | while read -r addr; do parse_and_check $addr || exit 1 diff --git a/helm/oauth2-proxy/templates/deployment.yaml b/helm/oauth2-proxy/templates/deployment.yaml index be20a45..ee280d0 100644 --- a/helm/oauth2-proxy/templates/deployment.yaml +++ b/helm/oauth2-proxy/templates/deployment.yaml @@ -72,9 +72,13 @@ spec: - name: OAUTH2_PROXY_REDIS_CONNECTION_URL value: {{ include "oauth2-proxy.redis.StandaloneUrl" . }} {{- else if eq (default "" .Values.sessionStorage.redis.clientType) "cluster" }} + - name: OAUTH2_PROXY_REDIS_USE_CLUSTER + value: "true" - name: OAUTH2_PROXY_REDIS_CLUSTER_CONNECTION_URLS value: {{ .Values.sessionStorage.redis.cluster.connectionUrls }} {{- else if eq (default "" .Values.sessionStorage.redis.clientType) "sentinel" }} + - name: OAUTH2_PROXY_REDIS_USE_SENTINEL + value: "true" - name: OAUTH2_PROXY_REDIS_SENTINEL_CONNECTION_URLS value: {{ .Values.sessionStorage.redis.sentinel.connectionUrls }} {{- end }}