diff --git a/charts/tidepool/Chart.yaml b/charts/tidepool/Chart.yaml index 90c248e0..3a98fbd5 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.25.3 +version: 0.25.4 maintainers: - name: Todd Kazakov email: todd@tidepool.org diff --git a/charts/tidepool/charts/auth/templates/1-deployment.yaml b/charts/tidepool/charts/auth/templates/1-deployment.yaml index 3f2835ef..7f336c9a 100644 --- a/charts/tidepool/charts/auth/templates/1-deployment.yaml +++ b/charts/tidepool/charts/auth/templates/1-deployment.yaml @@ -408,6 +408,104 @@ 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 + - 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 - name: TIDEPOOL_OURA_JOTFORM_API_KEY valueFrom: secretKeyRef: diff --git a/charts/tidepool/charts/auth/templates/4-routetable.yaml b/charts/tidepool/charts/auth/templates/4-routetable.yaml index 45344ed1..77c1b5c2 100644 --- a/charts/tidepool/charts/auth/templates/4-routetable.yaml +++ b/charts/tidepool/charts/auth/templates/4-routetable.yaml @@ -196,5 +196,15 @@ spec: single: upstream: name: auth - + - matchers: + - methods: + - GET + - POST + - PUT + - DELETE + regex: /v1/users/(legacy/)?[^/]+/profile + routeAction: + single: + upstream: + name: auth {{- end }} diff --git a/charts/tidepool/charts/clinic-worker/templates/1-deployment.yaml b/charts/tidepool/charts/clinic-worker/templates/1-deployment.yaml index 14f5e7b7..1ea97d51 100644 --- a/charts/tidepool/charts/clinic-worker/templates/1-deployment.yaml +++ b/charts/tidepool/charts/clinic-worker/templates/1-deployment.yaml @@ -52,7 +52,7 @@ spec: - name: TIDEPOOL_AUTH_CLIENT_ADDRESS value: "http://shoreline:{{.Values.global.ports.shoreline}}" - name: TIDEPOOL_SEAGULL_CLIENT_ADDRESS - value: "http://seagull:{{.Values.global.ports.seagull}}" + value: "http://auth:{{.Values.global.ports.auth}}/metadata" - name: TIDEPOOL_GATEKEEPER_CLIENT_ADDRESS value: "http://gatekeeper:{{.Values.global.ports.gatekeeper}}" - name: TIDEPOOL_CLINIC_CLIENT_ADDRESS diff --git a/charts/tidepool/charts/clinic/templates/1-deployment.yaml b/charts/tidepool/charts/clinic/templates/1-deployment.yaml index 8eae6eed..9e26b17a 100644 --- a/charts/tidepool/charts/clinic/templates/1-deployment.yaml +++ b/charts/tidepool/charts/clinic/templates/1-deployment.yaml @@ -66,7 +66,7 @@ spec: - name: TIDEPOOL_SHORELINE_CLIENT_ADDRESS value: "http://shoreline:{{.Values.global.ports.shoreline}}" - name: TIDEPOOL_SEAGULL_CLIENT_ADDRESS - value: "http://seagull:{{.Values.global.ports.seagull}}" + value: "http://auth:{{.Values.global.ports.auth}}/metadata" - name: TIDEPOOL_GATEKEEPER_CLIENT_ADDRESS value: "http://gatekeeper:{{.Values.global.ports.gatekeeper}}" - name: TIDEPOOL_REDOX_VERIFICATION_TOKEN diff --git a/charts/tidepool/charts/hydrophone/templates/1-deployment.yaml b/charts/tidepool/charts/hydrophone/templates/1-deployment.yaml index d40eae31..239cd974 100644 --- a/charts/tidepool/charts/hydrophone/templates/1-deployment.yaml +++ b/charts/tidepool/charts/hydrophone/templates/1-deployment.yaml @@ -78,7 +78,7 @@ spec: - name: TIDEPOOL_DATA_CLIENT_ADDRESS value: "http://data:{{.Values.global.ports.data}}" - name: TIDEPOOL_SEAGULL_CLIENT_ADDRESS - value: "http://seagull:{{.Values.global.ports.seagull}}" + value: "http://auth:{{.Values.global.ports.auth}}/metadata" - name: TIDEPOOL_PERMISSION_CLIENT_ADDRESS value: "http://gatekeeper:{{.Values.global.ports.gatekeeper}}" - name: TIDEPOOL_METRICS_CLIENT_ADDRESS diff --git a/charts/tidepool/charts/jellyfish/templates/1-deployment.yaml b/charts/tidepool/charts/jellyfish/templates/1-deployment.yaml index 11152e30..df15cd10 100644 --- a/charts/tidepool/charts/jellyfish/templates/1-deployment.yaml +++ b/charts/tidepool/charts/jellyfish/templates/1-deployment.yaml @@ -76,7 +76,7 @@ spec: - name: TIDEPOOL_AUTH_CLIENT_ADDRESS value: "shoreline:{{.Values.global.ports.shoreline}}" - name: TIDEPOOL_SEAGULL_CLIENT_ADDRESS - value: "seagull:{{.Values.global.ports.seagull}}" + value: "auth:{{.Values.global.ports.auth}}/metadata" - name: TIDEPOOL_PERMISSION_CLIENT_ADDRESS value: "gatekeeper:{{.Values.global.ports.gatekeeper}}" image: "{{ .Values.deployment.image }}" diff --git a/charts/tidepool/charts/seagull/templates/4-routetable.yaml b/charts/tidepool/charts/seagull/templates/4-routetable.yaml index bed57dd4..950c9cc8 100644 --- a/charts/tidepool/charts/seagull/templates/4-routetable.yaml +++ b/charts/tidepool/charts/seagull/templates/4-routetable.yaml @@ -20,6 +20,36 @@ 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/users/[^/]+/users' + routeAction: + single: + upstream: + name: auth + options: + regexRewrite: + pattern: + regex: '/metadata/users/' + substitution: '/v1/users/' + retries: + retryOn: '5xx' + numRetries: 3 + perTryTimeout: '15s' - matchers: - prefix: /metadata/ routeAction: diff --git a/charts/tidepool/charts/shoreline/templates/1-deployment.yaml b/charts/tidepool/charts/shoreline/templates/1-deployment.yaml index d3f97fea..ea6d6f1f 100644 --- a/charts/tidepool/charts/shoreline/templates/1-deployment.yaml +++ b/charts/tidepool/charts/shoreline/templates/1-deployment.yaml @@ -144,7 +144,7 @@ spec: - name: TIDEPOOL_AUTH_CLIENT_ADDRESS value: "http://shoreline:{{.Values.global.ports.shoreline}}" - name: TIDEPOOL_SEAGULL_CLIENT_ADDRESS - value: "http://seagull:{{.Values.global.ports.seagull}}" + value: "http://auth:{{.Values.global.ports.auth}}/metadata" - name: TIDEPOOL_PERMISSION_CLIENT_ADDRESS value: "http://gatekeeper:{{.Values.global.ports.gatekeeper}}" - name: TIDEPOOL_METRICS_CLIENT_ADDRESS diff --git a/charts/tidepool/charts/tidewhisperer/templates/1-deployment.yaml b/charts/tidepool/charts/tidewhisperer/templates/1-deployment.yaml index f2a47389..96b0214b 100644 --- a/charts/tidepool/charts/tidewhisperer/templates/1-deployment.yaml +++ b/charts/tidepool/charts/tidewhisperer/templates/1-deployment.yaml @@ -78,7 +78,7 @@ spec: "host": "hakken", "skipHakken": true }, - "seagull": {"serviceSpec": {"type": "static", "hosts": ["http://seagull:{{.Values.global.ports.seagull}}"]}}, + "seagull": {"serviceSpec": {"type": "static", "hosts": ["http://auth:{{.Values.global.ports.auth}}/metadata"]}}, "shoreline": { "name": "tide-whisperer", "serviceSpec": {"type": "static", "hosts": ["http://shoreline:{{.Values.global.ports.shoreline}}"]},