Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: connection urls to be automatically comma separated #268

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: connection urls to be automatically comma separated #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
733f0e2
fix: connection urls to be automatically comma separated
tuunit Nov 27, 2024
cd9500b
Merge branch 'main' into fix-connection-urls-syntax
pierluigilenoci Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions helm/oauth2-proxy/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: oauth2-proxy
version: 7.10.2
version: 7.10.3
apiVersion: v2
appVersion: 7.8.1
home: https://oauth2-proxy.github.io/oauth2-proxy/
Expand All @@ -22,20 +22,17 @@ sources:
- https://github.com/oauth2-proxy/oauth2-proxy
- https://github.com/oauth2-proxy/manifests
maintainers:
- name: desaintmartin
email: [email protected]
- name: tlawrie
- name: NickMeves
email: [email protected]
- name: JoelSpeed
email: [email protected]
- name: pierluigilenoci
email: [email protected]
- name: tuunit
email: [email protected]
- name: JoelSpeed
email: [email protected]
kubeVersion: ">=1.16.0-0"
annotations:
artifacthub.io/changes: |
- kind: changed
description: update helm release redis to v20.6.3
- kind: fixed
description: automatically concatenate connectionUrls with comma
links:
- name: Github PR
url: https://github.com/oauth2-proxy/manifests/pull/279
url: https://github.com/oauth2-proxy/manifests/pull/268
18 changes: 18 additions & 0 deletions helm/oauth2-proxy/ci/redis-sentinel-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
sessionStorage:
type: redis
redis:
clientType: sentinel
sentinel:
password: "foo"
connectionUrls:
- "redis://oauth2-proxy-redis.svc:6379"
redis:
# provision an instance of the redis sub-chart
enabled: true
architecture: replication
global:
redis:
password: "foo"
initContainers:
waitForRedis:
enabled: true
8 changes: 4 additions & 4 deletions helm/oauth2-proxy/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ spec:
- name: OAUTH2_PROXY_REDIS_USE_CLUSTER
value: "true"
- name: OAUTH2_PROXY_REDIS_CLUSTER_CONNECTION_URLS
value: {{ .Values.sessionStorage.redis.cluster.connectionUrls }}
value: {{ join "," .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 }}
value: {{ join "," .Values.sessionStorage.redis.sentinel.connectionUrls }}
{{- end }}
{{- if .Values.initContainers.waitForRedis.securityContext.enabled }}
{{- $securityContext := unset .Values.initContainers.waitForRedis.securityContext "enabled" }}
Expand Down Expand Up @@ -213,14 +213,14 @@ spec:
- name: OAUTH2_PROXY_REDIS_USE_CLUSTER
value: "true"
- name: OAUTH2_PROXY_REDIS_CLUSTER_CONNECTION_URLS
value: {{ .Values.sessionStorage.redis.cluster.connectionUrls }}
value: {{ join "," .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_MASTER_NAME
value: {{ .Values.sessionStorage.redis.sentinel.masterName }}
- name: OAUTH2_PROXY_REDIS_SENTINEL_CONNECTION_URLS
value: {{ .Values.sessionStorage.redis.sentinel.connectionUrls }}
value: {{ join "," .Values.sessionStorage.redis.sentinel.connectionUrls }}
{{- if or .Values.sessionStorage.redis.sentinel.existingSecret .Values.sessionStorage.redis.existingSecret .Values.sessionStorage.redis.sentinel.password }}
- name: OAUTH2_PROXY_REDIS_SENTINEL_PASSWORD
valueFrom:
Expand Down
8 changes: 6 additions & 2 deletions helm/oauth2-proxy/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,8 +371,10 @@ sessionStorage:
# URL of redis standalone server for redis session storage (e.g. `redis://HOST[:PORT]`). Automatically generated if not set
connectionUrl: ""
cluster:
# List of Redis cluster connection URLs (e.g. `["redis://127.0.0.1:8000", "redis://127.0.0.1:8000"]`)
# List of Redis cluster connection URLs. Array or single string allowed.
connectionUrls: []
# - "redis://127.0.0.1:8000"
# - "redis://127.0.0.1:8001"
sentinel:
# Name of the Kubernetes secret containing the redis sentinel password value (see also `sessionStorage.redis.sentinel.passwordKey`). Default: `sessionStorage.redis.existingSecret`
existingSecret: ""
Expand All @@ -382,8 +384,10 @@ sessionStorage:
passwordKey: "redis-sentinel-password"
# Redis sentinel master name
masterName: ""
# List of Redis sentinel connection URLs (e.g. `["redis://127.0.0.1:8000", "redis://127.0.0.1:8000"]`)
# List of Redis cluster connection URLs. Array or single string allowed.
connectionUrls: []
# - "redis://127.0.0.1:8000"
# - "redis://127.0.0.1:8001"

# Enables and configure the automatic deployment of the redis subchart
redis:
Expand Down
Loading