From 9db60451aa18e993d08f1dc69101c3ad726b053e Mon Sep 17 00:00:00 2001 From: Jonathan Perret Date: Wed, 25 Mar 2026 10:37:00 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7(helm)=20use=20stateless=20OIDC=20i?= =?UTF-8?q?n=20dev=20and=20staging?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Getting rid of Redis should help with performance. --- docker-compose.yml | 7 +------ src/helm/env.d/dev/values.oidc2fer.yaml.gotmpl | 2 +- src/helm/env.d/staging/values.oidc2fer.yaml.gotmpl | 2 +- src/helm/helmfile.yaml.gotmpl | 14 +------------- 4 files changed, 4 insertions(+), 21 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 46075ce..58fc605 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: GUNICORN_CMD_ARGS: --workers=2 TEST_E2E: 1 #TEST_E2E_PC: 1 - OIDC_DB_URI: redis://redis/0 + OIDC_DB_URI: stateless://:STATE-ENCRYPTION-KEY@localhost CLIENT_DB_JSON: | { "oidc-test-client": { @@ -38,8 +38,6 @@ services: volumes: - ./src/satosa:/app - ./docker/files/usr/local/etc/gunicorn/satosa.py:/usr/local/etc/gunicorn/satosa.py - depends_on: - - redis healthcheck: test: ["CMD", "curl", "--fail", "http://localhost:8000/ping"] interval: 60s @@ -77,9 +75,6 @@ services: extra_hosts: - "oidc2fer.127.0.0.1.nip.io:host-gateway" - redis: - image: redis:7.2.4 - nginx: image: nginx:1.25 ports: diff --git a/src/helm/env.d/dev/values.oidc2fer.yaml.gotmpl b/src/helm/env.d/dev/values.oidc2fer.yaml.gotmpl index 6e5207a..99a28fd 100644 --- a/src/helm/env.d/dev/values.oidc2fer.yaml.gotmpl +++ b/src/helm/env.d/dev/values.oidc2fer.yaml.gotmpl @@ -32,7 +32,7 @@ satosa: valueFrom: { secretKeyRef: { name: oidc2fer, key: OIDC_FRONTEND_KEY } } - name: OIDC_DB_URI - value: "redis://:pass@redis-master:6379" + value: "stateless://:$(STATE_ENCRYPTION_KEY)@localhost" - name: CLIENT_DB_JSON value: |- diff --git a/src/helm/env.d/staging/values.oidc2fer.yaml.gotmpl b/src/helm/env.d/staging/values.oidc2fer.yaml.gotmpl index 2f0c972..ba6737f 100644 --- a/src/helm/env.d/staging/values.oidc2fer.yaml.gotmpl +++ b/src/helm/env.d/staging/values.oidc2fer.yaml.gotmpl @@ -35,7 +35,7 @@ satosa: valueFrom: { secretKeyRef: { name: oidc2fer, key: CLIENT_DB_JSON } } - name: OIDC_DB_URI - valueFrom: { secretKeyRef: { name: redis.redis.libre.sh, key: url } } + value: "stateless://:$(STATE_ENCRYPTION_KEY)@localhost" - name: SIRET_MAP value: |- diff --git a/src/helm/helmfile.yaml.gotmpl b/src/helm/helmfile.yaml.gotmpl index d58bc3f..febdec1 100644 --- a/src/helm/helmfile.yaml.gotmpl +++ b/src/helm/helmfile.yaml.gotmpl @@ -21,20 +21,8 @@ repositories: oci: true releases: - - name: redis - installed: {{ eq .Environment.Name "dev" | toYaml }} - namespace: {{ .Namespace }} - chart: bitnami/redis - version: 18.19.2 - values: - - auth: - password: pass - architecture: standalone - image: - repository: bitnamilegacy/redis - - name: extra - installed: {{ ne .Environment.Name "dev" | toYaml }} + installed: {{ eq .Environment.Name "outscale-production" | toYaml }} namespace: {{ .Namespace }} chart: ./extra secrets: