diff --git a/charts/tidepool/Chart.lock b/charts/tidepool/Chart.lock index 75eb231a..b87146c4 100644 --- a/charts/tidepool/Chart.lock +++ b/charts/tidepool/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: keycloak repository: file://../keycloak - version: 0.4.0 -digest: sha256:45ca043092d026181796efd3428c4f3127545c4f7b61bd4ddc296e32b13ab1c3 -generated: "2023-12-07T13:29:14.699087-08:00" + version: 0.4.2 +digest: sha256:bea169e688dc10efdcf259b8c30ee2f90e0ca6e519464bd957f9e1be0a5b8564 +generated: "2024-06-25T11:24:28.447782+03:00" diff --git a/charts/tidepool/charts/blob/templates/4-routetable.yaml b/charts/tidepool/charts/blob/templates/4-routetable.yaml index 7a0f793c..4231db5c 100644 --- a/charts/tidepool/charts/blob/templates/4-routetable.yaml +++ b/charts/tidepool/charts/blob/templates/4-routetable.yaml @@ -40,7 +40,7 @@ spec: - methods: - GET - POST - regex: /v1/users/[^/]+/device_logs + regex: /v1/users/[^/]+/device_logs.* routeAction: single: upstream: diff --git a/charts/tidepool/charts/clinic/templates/0-configmap.yaml b/charts/tidepool/charts/clinic/templates/0-configmap.yaml index 420b0749..b1f012cf 100644 --- a/charts/tidepool/charts/clinic/templates/0-configmap.yaml +++ b/charts/tidepool/charts/clinic/templates/0-configmap.yaml @@ -14,4 +14,5 @@ data: XealthServerBaseUrl: {{ .Values.configmap.data.XealthServerBaseUrl | quote }} KafkaTopicPrefix: {{ .Values.configmap.data.KafkaTopicPrefix | quote }} KafkaTopic: {{ .Values.configmap.data.KafkaTopic | quote }} + KeycloakTokenEndpoint: {{ .Values.configmap.data.KeycloakTokenEndpoint | quote }} {{- end }} diff --git a/charts/tidepool/charts/clinic/templates/1-deployment.yaml b/charts/tidepool/charts/clinic/templates/1-deployment.yaml index 54f2fb85..91d5ea7c 100644 --- a/charts/tidepool/charts/clinic/templates/1-deployment.yaml +++ b/charts/tidepool/charts/clinic/templates/1-deployment.yaml @@ -45,6 +45,12 @@ spec: {{ include "charts.platform.env.mongo" .}} {{ include "charts.platform.env.clients" .}} {{ include "charts.tracing.common" .}} + - name: TIDEPOOL_AUTH_SERVICE_TOKEN_ENDPOINT + valueFrom: + configMapKeyRef: + name: clinic + key: KeycloakTokenEndpoint + optional: true - name: CLINIC_DEMO_PATIENT_USER_ID valueFrom: configMapKeyRef: diff --git a/charts/tidepool/charts/clinic/values.yaml b/charts/tidepool/charts/clinic/values.yaml index c2f20274..a5e49b60 100644 --- a/charts/tidepool/charts/clinic/values.yaml +++ b/charts/tidepool/charts/clinic/values.yaml @@ -10,6 +10,7 @@ configmap: XealthBearerToken: '' XealthTokenUrl: 'https://auth-staging.xealth.io/oauth2/token' XealthServerBaseUrl: 'https://provider-staging.xealth.io/v2' + KeycloakTokenEndpoint: 'http://keycloak-http.default.svc.cluster.local/realms/dev/protocol/openid-connect/token' deployment: # -- Docker image image: tidepool/clinic:master-latest