diff --git a/charts/tidepool/Chart.yaml b/charts/tidepool/Chart.yaml index 0db2e74c..b31d069d 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/auth/templates/1-deployment.yaml b/charts/tidepool/charts/auth/templates/1-deployment.yaml index 65c22644..cdf6b4d7 100644 --- a/charts/tidepool/charts/auth/templates/1-deployment.yaml +++ b/charts/tidepool/charts/auth/templates/1-deployment.yaml @@ -320,6 +320,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 {{- range $key, $val := ((.Values.deployment).extraEnv | default ((.Values.global).deployment).extraEnv | default (dict)) }} - name: {{ $key }} value: {{ $val | quote }} diff --git a/charts/tidepool/charts/auth/templates/4-routetable.yaml b/charts/tidepool/charts/auth/templates/4-routetable.yaml index 0541d048..cae95ea6 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 }} 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 f40cdb7a..04a59b3e 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: diff --git a/charts/tidepool/charts/seagull/templates/4-routetable.yaml b/charts/tidepool/charts/seagull/templates/4-routetable.yaml index bed57dd4..f54df0f1 100644 --- a/charts/tidepool/charts/seagull/templates/4-routetable.yaml +++ b/charts/tidepool/charts/seagull/templates/4-routetable.yaml @@ -20,6 +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: - prefix: /metadata/ routeAction: