Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

care partner alerts APNs configuration #296

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/tidepool/charts/clinic/templates/4-routetable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ spec:
- POST
- PUT
prefix: /v1/clinics
options:
{{ if not .Values.global.glooingress.jwt.disabled }}
options:
jwt:
disable: false
{{- end }}
Expand Down
16 changes: 16 additions & 0 deletions charts/tidepool/charts/data/templates/0-configmap.yaml
Original file line number Diff line number Diff line change
@@ -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 "" }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
pusherAPNSKeyID: {{ .pusherAPNSKeyID | default "" }}
pusherAPNSKeyID: {{ .PusherAPNSKeyID | default "" }}

pusherAPNSTeamID: {{ .pusherAPNSTeamID | default "" }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
pusherAPNSTeamID: {{ .pusherAPNSTeamID | default "" }}
PusherAPNSTeamID: {{ .pusherAPNSTeamID | default "" }}

pusherAPNSBundleID: {{ .pusherAPNSBundleID | default "" }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
pusherAPNSBundleID: {{ .pusherAPNSBundleID | default "" }}
PusherAPNSBundleID: {{ .pusherAPNSBundleID | default "" }}

{{- end }}
{{- end }}
7 changes: 7 additions & 0 deletions charts/tidepool/charts/data/templates/0-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
pusherAPNSSigningKey: {{ .Values.secret.data_.pusherAPNSSigningKey | default "" | quote }}
PusherAPNSSigningKey: {{ .Values.secret.data_.Pusher.APNS.SigningKey | default "" | quote }}

kind: Secret
metadata:
name: data
Expand Down
20 changes: 20 additions & 0 deletions charts/tidepool/charts/data/templates/1-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
key: pusherAPNSSigningKey
key: PusherAPNSSigningKey

- name: TIDEPOOL_DATA_SERVICE_PUSHER_APNS_KEY_ID
valueFrom:
configMapKeyRef:
name: data
key: pusherAPNSKeyID
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
key: pusherAPNSKeyID
key: PusherAPNSKeyID

- name: TIDEPOOL_DATA_SERVICE_PUSHER_APNS_TEAM_ID
valueFrom:
configMapKeyRef:
name: data
key: pusherAPNSTeamID
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
key: pusherAPNSTeamID
key: PusherAPNSTeamID

- name: TIDEPOOL_DATA_SERVICE_PUSHER_APNS_BUNDLE_ID
valueFrom:
configMapKeyRef:
name: data
key: pusherAPNSBundleID
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
key: pusherAPNSBundleID
key: PusherAPNSBundleID

image: "{{ .Values.deployment.image }}"
securityContext:
{{- .Values.podSecurityContext | toYaml | nindent 10 }}
Expand Down
9 changes: 9 additions & 0 deletions charts/tidepool/charts/data/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
pusherAPNSKeyID: "QA3495JW4S"
PusherAPNSKeyID: "QA3495JW4S"

pusherAPNSTeamID: "75U4X84TEG"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
pusherAPNSTeamID: "75U4X84TEG"
PusherAPNSTeamID: "75U4X84TEG"

pusherAPNSBundleID: "org.tidepool.carepartner"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
pusherAPNSBundleID: "org.tidepool.carepartner"
PusherAPNSBundleID: "org.tidepool.carepartner"


# -- memory and cpu resources for pods
resources: {}
Expand Down
2 changes: 2 additions & 0 deletions charts/tidepool/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down