Merge remote-tracking branch 'origin/master' into jimmy/BACK-2784-proxy-user-profile-requests

Author: lostlevels

charts/tidepool/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Tidepool
 name: tidepool
-version: 0.19.0
+version: 0.22.0
 maintainers:
   - name: Todd Kazakov
     email: todd@tidepool.org

charts/tidepool/charts/auth/templates/0-configmap.yaml

@@ -12,5 +12,7 @@ data:
   AppleDeviceCheckKeyId: {{ .AppleDeviceCheckKeyId | default "" }}
   AppleDeviceCheckKeyIssuer: {{ .AppleDeviceCheckKeyIssuer | default "" }}
   AppleDeviceCheckUseDevelopment: "{{ .AppleDeviceCheckUseDevelopment | default "true" }}"
+  BigDataDonationProjectDataRecipientUserId: "{{ .BigDataDonationProjectDataRecipientUserId | default "" }}"
+  BigDataDonationProjectSharingDisabled: "{{ .BigDataDonationProjectSharingDisabled | default "true" }}"
 {{- end }}
 {{- end }}

charts/tidepool/charts/auth/templates/1-deployment.yaml

@@ -27,8 +27,9 @@ spec:
         app: auth
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: auth
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
@@ -241,6 +242,18 @@ spec:
               name: auth
               key: AppValidationChallengeSize
               optional: true
+        - name: TIDEPOOL_BIG_DATA_DONATION_PROJECT_SHARING_DISABLED
+          valueFrom:
+            configMapKeyRef:
+              name: auth
+              key: BigDataDonationProjectSharingDisabled
+              optional: false
+        - name: TIDEPOOL_BIG_DATA_DONATION_PROJECT_DATA_RECIPIENT_USER_ID
+          valueFrom:
+            configMapKeyRef:
+              name: auth
+              key: BigDataDonationProjectDataRecipientUserId
+              optional: true
         - name: COASTAL_API_KEY
           valueFrom:
             secretKeyRef:

charts/tidepool/charts/auth/templates/4-routetable.yaml

@@ -63,7 +63,7 @@ spec:
       - GET
       - PUT
       - DELETE
-      regex: /v1/provider_sessions/[^/]+
+      prefix: /v1/provider_sessions
     routeAction:
       single:
         upstream:
@@ -163,4 +163,31 @@ spec:
       single:
         upstream:
           name: auth
+  - matchers:
+      - methods:
+          - GET
+        prefix: /v1/consents
+    routeAction:
+      single:
+        upstream:
+          name: auth
+  - matchers:
+      - methods:
+          - GET
+          - POST
+        regex: /v1/users/[^/]+/consents
+    routeAction:
+      single:
+        upstream:
+          name: auth
+  - matchers:
+      - methods:
+          - GET
+          - PATCH
+          - DELETE
+        regex: /v1/users/[^/]+/consents/[^/]+
+    routeAction:
+      single:
+        upstream:
+          name: auth
 {{- end }}

charts/tidepool/charts/auth/values.yaml

@@ -12,6 +12,8 @@ configmap:
     AppleDeviceCheckKeyIssuer: "75U4X84TEG"
     AppleDeviceCheckKeyId: "B542R658GF"
     AppleDeviceCheckUseDevelopment: "true"
+    BigDataDonationProjectDataRecipientUserId: ""
+    BigDataDonationProjectSharingDisabled: "true"
 deployment:
   # -- secrets used to pull images
   imagePullSecrets:

charts/tidepool/charts/blip/templates/1-deployment.yaml

@@ -25,8 +25,9 @@ spec:
         app: blip
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: blip
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:

charts/tidepool/charts/blob/templates/1-deployment.yaml

@@ -22,8 +22,9 @@ spec:
   strategy: {}
   template:
     metadata:
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: blob
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
       labels:

charts/tidepool/charts/clinic-worker/templates/1-deployment.yaml

@@ -27,8 +27,9 @@ spec:
         app: clinic-worker
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: clinic-worker
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:

charts/tidepool/charts/clinic/templates/1-deployment.yaml

@@ -27,8 +27,9 @@ spec:
         app: clinic
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: clinic
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:

charts/tidepool/charts/data/templates/1-deployment.yaml

@@ -27,8 +27,9 @@ spec:
         app: data
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: data
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec: