From 2a1d303fa7eedfe442d9aeb67503fa0dc0f4c8f4 Mon Sep 17 00:00:00 2001 From: lostlevels Date: Mon, 18 Mar 2024 12:37:40 -0700 Subject: [PATCH 1/9] [BACK-2784] Proxy user profile requests to auth instead of seagull. --- charts/tidepool/charts/seagull/templates/4-routetable.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/tidepool/charts/seagull/templates/4-routetable.yaml b/charts/tidepool/charts/seagull/templates/4-routetable.yaml index bed57dd48..851aab5c4 100644 --- a/charts/tidepool/charts/seagull/templates/4-routetable.yaml +++ b/charts/tidepool/charts/seagull/templates/4-routetable.yaml @@ -25,8 +25,9 @@ spec: routeAction: single: upstream: - name: seagull + name: auth options: + prefixRewrite: /v1/users/ retries: retryOn: '5xx' numRetries: 3 From 5131fcb4f149a465d4f097ad23b4cd2ed6702bf2 Mon Sep 17 00:00:00 2001 From: lostlevels Date: Wed, 27 Mar 2024 13:25:52 -0700 Subject: [PATCH 2/9] Only rewrite and send profile requests to auth service. --- .../charts/seagull/templates/4-routetable.yaml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/charts/tidepool/charts/seagull/templates/4-routetable.yaml b/charts/tidepool/charts/seagull/templates/4-routetable.yaml index 851aab5c4..41a15d764 100644 --- a/charts/tidepool/charts/seagull/templates/4-routetable.yaml +++ b/charts/tidepool/charts/seagull/templates/4-routetable.yaml @@ -21,13 +21,27 @@ spec: extauth: disable: true - matchers: - - prefix: /metadata/ + - regex: '/metadata/[^/]+/profile' routeAction: single: upstream: name: auth options: - prefixRewrite: /v1/users/ + regexRewrite: + pattern: + regex: '/metadata/' + substitution: '/v1/users/' + retries: + retryOn: '5xx' + numRetries: 3 + perTryTimeout: '15s' + - matchers: + - prefix: /metadata/ + routeAction: + single: + upstream: + name: seagull + options: retries: retryOn: '5xx' numRetries: 3 From 26b9e13aef34505d07aa83eb1e5dbdd6ac79056c Mon Sep 17 00:00:00 2001 From: lostlevels Date: Mon, 1 Apr 2024 08:05:17 -0700 Subject: [PATCH 3/9] Proxy legacy style profiles from segaull to auth. --- charts/tidepool/charts/seagull/templates/4-routetable.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tidepool/charts/seagull/templates/4-routetable.yaml b/charts/tidepool/charts/seagull/templates/4-routetable.yaml index 41a15d764..939f4403a 100644 --- a/charts/tidepool/charts/seagull/templates/4-routetable.yaml +++ b/charts/tidepool/charts/seagull/templates/4-routetable.yaml @@ -30,7 +30,7 @@ spec: regexRewrite: pattern: regex: '/metadata/' - substitution: '/v1/users/' + substitution: '/v1/users/legacy/' retries: retryOn: '5xx' numRetries: 3 From 89a8678a58b33573ee3c3b60fd2040a662b3ff4f Mon Sep 17 00:00:00 2001 From: lostlevels Date: Tue, 24 Jun 2025 14:40:52 -0700 Subject: [PATCH 4/9] Add keycloak config to platform-auth env variables. --- .../charts/auth/templates/1-deployment.yaml | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/charts/tidepool/charts/auth/templates/1-deployment.yaml b/charts/tidepool/charts/auth/templates/1-deployment.yaml index 65c22644e..b40a854ee 100644 --- a/charts/tidepool/charts/auth/templates/1-deployment.yaml +++ b/charts/tidepool/charts/auth/templates/1-deployment.yaml @@ -320,6 +320,66 @@ spec: name: palmtree key: tlsKeyData optional: true + - name: TIDEPOOL_KEYCLOAK_CLIENT_ID + valueFrom: + configMapKeyRef: + name: shoreline + key: KeycloakClientId + optional: true + - name: TIDEPOOL_KEYCLOAK_CLIENT_SECRET + valueFrom: + secretKeyRef: + name: shoreline + key: KeycloakClientSecret + optional: true + - name: TIDEPOOL_KEYCLOAK_LONG_LIVED_CLIENT_ID + valueFrom: + configMapKeyRef: + name: shoreline + key: KeycloakLongLivedClientId + optional: true + - name: TIDEPOOL_KEYCLOAK_LONG_LIVED_CLIENT_SECRET + valueFrom: + secretKeyRef: + name: shoreline + key: KeycloakLongLivedClientSecret + optional: true + - name: TIDEPOOL_KEYCLOAK_BACKEND_CLIENT_ID + valueFrom: + configMapKeyRef: + name: shoreline + key: KeycloakBackendClientId + optional: true + - name: TIDEPOOL_KEYCLOAK_BACKEND_CLIENT_SECRET + valueFrom: + secretKeyRef: + name: shoreline + key: KeycloakBackendClientSecret + optional: true + - name: TIDEPOOL_KEYCLOAK_ADMIN_USERNAME + valueFrom: + configMapKeyRef: + name: shoreline + key: KeycloakAdminUsername + optional: true + - name: TIDEPOOL_KEYCLOAK_ADMIN_PASSWORD + valueFrom: + secretKeyRef: + name: shoreline + key: KeycloakAdminPassword + optional: true + - name: TIDEPOOL_KEYCLOAK_BASE_URL + valueFrom: + configMapKeyRef: + name: shoreline + key: KeycloakBaseUrl + optional: true + - name: TIDEPOOL_KEYCLOAK_REALM + valueFrom: + configMapKeyRef: + name: shoreline + key: KeycloakRealm + optional: true {{- range $key, $val := ((.Values.deployment).extraEnv | default ((.Values.global).deployment).extraEnv | default (dict)) }} - name: {{ $key }} value: {{ $val | quote }} From 0b9f19a67165b42497f6f91bf93fa93de07afc39 Mon Sep 17 00:00:00 2001 From: lostlevels Date: Tue, 24 Jun 2025 16:06:26 -0700 Subject: [PATCH 5/9] Temporarily disable seagull route rewrite to platform auth. --- .../seagull/templates/4-routetable.yaml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/charts/tidepool/charts/seagull/templates/4-routetable.yaml b/charts/tidepool/charts/seagull/templates/4-routetable.yaml index 939f4403a..f54df0f12 100644 --- a/charts/tidepool/charts/seagull/templates/4-routetable.yaml +++ b/charts/tidepool/charts/seagull/templates/4-routetable.yaml @@ -20,21 +20,21 @@ spec: options: extauth: disable: true - - matchers: - - regex: '/metadata/[^/]+/profile' - routeAction: - single: - upstream: - name: auth - options: - regexRewrite: - pattern: - regex: '/metadata/' - substitution: '/v1/users/legacy/' - retries: - retryOn: '5xx' - numRetries: 3 - perTryTimeout: '15s' + # - matchers: + # - regex: '/metadata/[^/]+/profile' + # routeAction: + # single: + # upstream: + # name: auth + # options: + # regexRewrite: + # pattern: + # regex: '/metadata/' + # substitution: '/v1/users/legacy/' + # retries: + # retryOn: '5xx' + # numRetries: 3 + # perTryTimeout: '15s' - matchers: - prefix: /metadata/ routeAction: From c6cbe85a10265e6bc523ef4cb7bf296976c32c88 Mon Sep 17 00:00:00 2001 From: lostlevels Date: Wed, 25 Jun 2025 19:30:02 -0700 Subject: [PATCH 6/9] Forgot to add seagull credentials for platform-auth while migration in progress. --- .../charts/auth/templates/1-deployment.yaml | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/charts/tidepool/charts/auth/templates/1-deployment.yaml b/charts/tidepool/charts/auth/templates/1-deployment.yaml index b40a854ee..cdf6b4d74 100644 --- a/charts/tidepool/charts/auth/templates/1-deployment.yaml +++ b/charts/tidepool/charts/auth/templates/1-deployment.yaml @@ -380,6 +380,44 @@ spec: name: shoreline key: KeycloakRealm optional: true + - name: SEAGULL_TIDEPOOL_STORE_SCHEME + valueFrom: + secretKeyRef: + name: {{ .Values.mongo.secretName }} + key: Scheme + optional: true + - name: SEAGULL_TIDEPOOL_STORE_USERNAME + valueFrom: + secretKeyRef: + name: {{ .Values.mongo.secretName }} + key: Username + optional: true + - name: SEAGULL_TIDEPOOL_STORE_PASSWORD + valueFrom: + secretKeyRef: + name: {{ .Values.mongo.secretName }} + key: Password + optional: true + - name: SEAGULL_TIDEPOOL_STORE_ADDRESSES + valueFrom: + secretKeyRef: + name: {{ .Values.mongo.secretName }} + key: Addresses + optional: true + - name: SEAGULL_TIDEPOOL_STORE_TLS + valueFrom: + secretKeyRef: + name: {{ .Values.mongo.secretName }} + key: Tls + optional: true + - name: SEAGULL_TIDEPOOL_STORE_OPT_PARAMS + valueFrom: + secretKeyRef: + name: {{ .Values.mongo.secretName }} + key: OptParams + optional: true + - name: SEAGULL_TIDEPOOL_STORE_DATABASE + value: seagull {{- range $key, $val := ((.Values.deployment).extraEnv | default ((.Values.global).deployment).extraEnv | default (dict)) }} - name: {{ $key }} value: {{ $val | quote }} From 465830267d6604fe453db0a1622eb305913e3eb5 Mon Sep 17 00:00:00 2001 From: lostlevels Date: Thu, 26 Jun 2025 13:45:16 -0700 Subject: [PATCH 7/9] Add matcher to route table for user v1 profiles. --- .../tidepool/charts/auth/templates/4-routetable.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/charts/tidepool/charts/auth/templates/4-routetable.yaml b/charts/tidepool/charts/auth/templates/4-routetable.yaml index 0541d0488..cae95ea60 100644 --- a/charts/tidepool/charts/auth/templates/4-routetable.yaml +++ b/charts/tidepool/charts/auth/templates/4-routetable.yaml @@ -179,5 +179,15 @@ spec: single: upstream: name: auth - + - matchers: + - methods: + - GET + - POST + - PUT + - DELETE + regex: /v1/users/(legacy/)?[^/]+/profile + routeAction: + single: + upstream: + name: auth {{- end }} From ded54198d13d462017bf27a11cdb6d0f86695318 Mon Sep 17 00:00:00 2001 From: Todd Kazakov Date: Mon, 10 Nov 2025 12:36:45 +0200 Subject: [PATCH 8/9] Tidepool 0.23.0 (#334) (#335) * Use strimzi 0.48.0 compatible image * Tidepool 0.23.0 --- charts/tidepool/Chart.yaml | 2 +- .../charts/kafka/templates/1-kafka-connect-mongo-cluster.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tidepool/Chart.yaml b/charts/tidepool/Chart.yaml index 0db2e74ca..b31d069de 100644 --- a/charts/tidepool/Chart.yaml +++ b/charts/tidepool/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: A Helm chart for Tidepool name: tidepool -version: 0.22.0 +version: 0.23.0 maintainers: - name: Todd Kazakov email: todd@tidepool.org diff --git a/charts/tidepool/charts/kafka/templates/1-kafka-connect-mongo-cluster.yaml b/charts/tidepool/charts/kafka/templates/1-kafka-connect-mongo-cluster.yaml index f40cdb7a8..04a59b3e6 100644 --- a/charts/tidepool/charts/kafka/templates/1-kafka-connect-mongo-cluster.yaml +++ b/charts/tidepool/charts/kafka/templates/1-kafka-connect-mongo-cluster.yaml @@ -50,7 +50,7 @@ spec: secret: secretName: {{ .Values.keycloak.secretName }} {{- end }} - image: tidepool/connect-debezium:0.42.0-kafka-3.6.0-mongo-1.14.1-pg-1.9.6 + image: tidepool/connect-debezium:0.48.0-kafka-4.1.0-mongo-1.14.1-pg-1.9.6 replicas: {{ .Values.global.kafka.connect.replicas | int }} {{ if .Values.global.kafka.connect.tlsEnabled }} tls: From fc942045670141a4f7cacda4ec64b228527f2a67 Mon Sep 17 00:00:00 2001 From: Todd Kazakov Date: Mon, 10 Nov 2025 12:54:43 +0200 Subject: [PATCH 9/9] Tidepool 0.23.0 (#334) (#337) * Use strimzi 0.48.0 compatible image * Tidepool 0.23.0