diff --git a/charts/tidepool/charts/clinic/templates/4-routetable.yaml b/charts/tidepool/charts/clinic/templates/4-routetable.yaml index 15fcd3c5..70b9fb44 100644 --- a/charts/tidepool/charts/clinic/templates/4-routetable.yaml +++ b/charts/tidepool/charts/clinic/templates/4-routetable.yaml @@ -17,8 +17,8 @@ spec: - POST - PUT prefix: /v1/clinics - options: {{ if not .Values.global.glooingress.jwt.disabled }} + options: jwt: disable: false {{- end }} diff --git a/charts/tidepool/charts/data/templates/0-configmap.yaml b/charts/tidepool/charts/data/templates/0-configmap.yaml new file mode 100644 index 00000000..f625a728 --- /dev/null +++ b/charts/tidepool/charts/data/templates/0-configmap.yaml @@ -0,0 +1,16 @@ +{{ if .Values.configmap.enabled -}} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: data # as in the data service + namespace: {{ .Release.Namespace }} + labels: +{{ include "charts.labels.standard" . }} +{{ with .Values.configmap.data_ }} +data: + pusherAPNSKeyID: {{ .pusherAPNSKeyID | default "" }} + pusherAPNSTeamID: {{ .pusherAPNSTeamID | default "" }} + pusherAPNSBundleID: {{ .pusherAPNSBundleID | default "" }} +{{- end }} +{{- end }} diff --git a/charts/tidepool/charts/data/templates/0-secret.yaml b/charts/tidepool/charts/data/templates/0-secret.yaml index 75c65c20..80d807d0 100644 --- a/charts/tidepool/charts/data/templates/0-secret.yaml +++ b/charts/tidepool/charts/data/templates/0-secret.yaml @@ -3,6 +3,13 @@ apiVersion: v1 data: ServiceAuth: {{ .Values.secret.data_.ServiceAuth | default (randAlphaNum 40) | b64enc | quote }} + # pusherAPNSSigningKey is the signing key for Apple Push Notification + # Service. It's a file you can find in 1Password. + # + # If you're running locally via the development cluster, you'll need to + # base64-encode the contents of that file, and add the resulting data to the + # secret. You'll also need to enable the secret in local/Tiltconfig.yaml. + pusherAPNSSigningKey: {{ .Values.secret.data_.pusherAPNSSigningKey | default "" | quote }} kind: Secret metadata: name: data diff --git a/charts/tidepool/charts/data/templates/1-deployment.yaml b/charts/tidepool/charts/data/templates/1-deployment.yaml index b6552407..6268a966 100644 --- a/charts/tidepool/charts/data/templates/1-deployment.yaml +++ b/charts/tidepool/charts/data/templates/1-deployment.yaml @@ -57,6 +57,26 @@ spec: value: data - name: TIDEPOOL_SYNC_TASK_STORE_DATABASE value: data + - name: TIDEPOOL_DATA_SERVICE_PUSHER_APNS_SIGNING_KEY + valueFrom: + secretKeyRef: + name: data + key: pusherAPNSSigningKey + - name: TIDEPOOL_DATA_SERVICE_PUSHER_APNS_KEY_ID + valueFrom: + configMapKeyRef: + name: data + key: pusherAPNSKeyID + - name: TIDEPOOL_DATA_SERVICE_PUSHER_APNS_TEAM_ID + valueFrom: + configMapKeyRef: + name: data + key: pusherAPNSTeamID + - name: TIDEPOOL_DATA_SERVICE_PUSHER_APNS_BUNDLE_ID + valueFrom: + configMapKeyRef: + name: data + key: pusherAPNSBundleID image: "{{ .Values.deployment.image }}" securityContext: {{- .Values.podSecurityContext | toYaml | nindent 10 }} diff --git a/charts/tidepool/charts/data/values.yaml b/charts/tidepool/charts/data/values.yaml index 8089d4ca..a033c6ac 100644 --- a/charts/tidepool/charts/data/values.yaml +++ b/charts/tidepool/charts/data/values.yaml @@ -3,10 +3,19 @@ secret: data_: # -- service authorization secret ServiceAuth: "" + Pusher: + APNS: + SigningKey: "" deployment: # -- Docker image image: tidepool/platform-data:master-latest replicas: 1 +configmap: + enabled: true + data_: + pusherAPNSKeyID: "QA3495JW4S" + pusherAPNSTeamID: "75U4X84TEG" + pusherAPNSBundleID: "org.tidepool.carepartner" # -- memory and cpu resources for pods resources: {} diff --git a/charts/tidepool/templates/_helpers.tpl b/charts/tidepool/templates/_helpers.tpl index 90a3a006..9155897f 100644 --- a/charts/tidepool/templates/_helpers.tpl +++ b/charts/tidepool/templates/_helpers.tpl @@ -65,6 +65,8 @@ Create environment variables used by all platform services. value: http://blob:{{.Values.global.ports.blob}} - name: TIDEPOOL_DATA_CLIENT_ADDRESS value: http://data:{{.Values.global.ports.data}} + - name: TIDEPOOL_ALERTS_CLIENT_ADDRESS + value: http://data:{{.Values.global.ports.data}} - name: TIDEPOOL_DATA_SOURCE_CLIENT_ADDRESS value: http://data:{{.Values.global.ports.data}} - name: TIDEPOOL_DEVICES_CLIENT_ADDRESS