Merge branch 'master' into BACK-1341-updates

Author: jh-bate

README.md

@@ -116,14 +116,14 @@ Managing a K8s cluster can be very challenging, and even more so when using one
 
 By using our Tilt setup, developers can very easily run a live-reloading instance of any of our frontend or backend services without needing to directly use or understand Helm or Kubernetes. All that's needed is uncommenting a couple of lines in a `Tiltconfig.yaml` file, and updating the local paths to where the developer has checked out the respective git repo, if different than the default defined in the config.
 
-**IMPORTANT NOTE:** We currently run against version `v0.30.5` of Tilt, so be sure to install the correct version when following the [Tilt Installation Instructions](https://docs.tilt.dev/install.html#alternative-installation).
+**IMPORTANT NOTE:** We currently run against version `v0.33.5` of Tilt, so be sure to install the correct version when following the [Tilt Installation Instructions](https://docs.tilt.dev/install.html#alternative-installation).
 
 ```bash
 # MacOS
-curl -fsSL https://github.com/windmilleng/tilt/releases/download/v0.30.5/tilt.0.30.5.mac.x86_64.tar.gz | tar -xzv tilt && sudo mv tilt /usr/local/bin/tilt
+curl -fsSL https://github.com/windmilleng/tilt/releases/download/v0.33.5/tilt.0.33.5.mac.x86_64.tar.gz | tar -xzv tilt && sudo mv tilt /usr/local/bin/tilt
 
 # Linux
-curl -fsSL https://github.com/windmilleng/tilt/releases/download/v0.30.5/tilt.0.30.5.linux.x86_64.tar.gz | tar -xzv tilt && sudo mv tilt /usr/local/bin/tilt
+curl -fsSL https://github.com/windmilleng/tilt/releases/download/v0.33.5/tilt.0.33.5.linux.x86_64.tar.gz | tar -xzv tilt && sudo mv tilt /usr/local/bin/tilt
 ```
 
 After installing Tilt, you can verify the correct version by typing `tilt version` in your terminal.
@@ -142,7 +142,7 @@ This config will provision and start up the Kubernetes server, and a private doc
 
 ## Install glooctl
 
-We provision the Gloo gateway, which is responsible for service routing, using glooctl. Please follow the [glooctl Installation Instructions](https://docs.solo.io/gloo-edge/master/installation/glooctl_setup/).
+We provision the Gloo gateway, which is responsible for service routing, using glooctl. Please follow the [glooctl Installation Instructions](https://docs.solo.io/gloo-edge/latest/installation/preparation/#glooctl).
 
 Once installed, you can provision the kubernetes stack with `glooctl`, using the `Glooconfig.yaml` configuration provided at the root of this repo.
 
@@ -166,7 +166,7 @@ yum install nc
 dnf install nc
 
 # Debian/Ubuntu
-sudo apt-get install Netcat
+sudo apt-get install netcat-openbsd # or netcat-traditional
 ```
 
 After installing Netcat, you can verify it's working by typing `nc -h` in your terminal.
@@ -516,7 +516,7 @@ dexcom:
       StateSalt: "<some-text>"
 ```
 
-NOTES: 
+NOTES:
  - ensure that in the dexcom developer setup the redirect URI is set correctly, for example if running locally `http://localhost:31500/v1/oauth/dexcom/redirect`
 
  - you will need to restart the tidepool services for the config changes to take effect

bin/tidepool

@@ -74,6 +74,7 @@ server_init() {
   check_docker_running
 
   cd ${DIR} && ctlptl apply -f Kindconfig.yaml
+  cd ${DIR} && glooctl install gateway -n default --values Glooconfig.yaml
 }
 
 server_start() {
@@ -150,7 +151,7 @@ doctor() {
   echo "Checking dependancy versions..."
   check_version ctlptl 'version' 0.8.5
   check_version helm 'version --short' 3.9.1
-  check_version tilt 'version' 0.30.5
+  check_version tilt 'version' 0.33.5
   check_version docker '-v' 20.10.17
   check_version kubectl 'version --client --short' 1.21.12
   check_version $MONGODB_SHELL '--eval "db.version()"' 5.0.0
@@ -216,7 +217,7 @@ case ${1-help} in
   port-forward) (cd ${DIR} && kubectl port-forward svc/${2} ${3});;
   verify-account-email) $MONGODB_SHELL --eval "db.users.update({username: \"${@:2}\"},{\$set:{\"authenticated\":true}});" user;;
   restart-gateway) restart gloo gateway-proxy gateway discovery;;
-  restart-kafka) restart default-kafka-connect-mongo-connect kafka-entity-operator strimzi-cluster-operator;;
+  restart-kafka) restart default-kafka-connect-mongo-connect kafka-entity-operator;;
   doctor) doctor;;
   *) usage;;
 esac

charts/tidepool/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Tidepool
 name: tidepool
-version: 0.15.8
+version: 0.15.10
 maintainers:
   - name: Todd Kazakov
     email: [email protected]

charts/tidepool/README.md

@@ -14,48 +14,48 @@ A Helm chart for Tidepool
 
 ## Values
 
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| global.fullnameOverride | string | `""` |  |
-| global.gateway.default.apiHost | string | `""` | host to use for API calls |
-| global.gateway.default.appHost | string | `""` | host to use for front end calls |
-| global.gateway.default.domain | string | `""` | domain to use for cookies |
-| global.gateway.default.host | string | `"localhost"` | hostname of web service |
-| global.gateway.default.protocol | string | `"http"` | scheme to use for web service |
+| Key | Type | Default           | Description |
+|-----|------|-------------------|-------------|
+| global.fullnameOverride | string | `""`              |  |
+| global.gateway.default.apiHost | string | `""`              | host to use for API calls |
+| global.gateway.default.appHost | string | `""`              | host to use for front end calls |
+| global.gateway.default.domain | string | `""`              | domain to use for cookies |
+| global.gateway.default.host | string | `"localhost"`     | hostname of web service |
+| global.gateway.default.protocol | string | `"http"`          | scheme to use for web service |
 | global.gateway.proxy.name | string | `"gateway-proxy"` |  |
-| global.gateway.proxy.namespace | string | `"gloo-system"` |  |
-| global.glooingress.enabled | bool | `true` | whether to use Gloo API Gateway for ingress |
-| global.glooingress.extauth.enabled | bool | `false` |  |
-| global.linkerdsupport.enabled | bool | `true` | whether to include linkerdsupport subchart with Linkerd service profiles |
-| global.logLevel | string | `"info"` | the default log level for all services |
-| global.maxTimeout | string | `"120s"` | maximum timeout for any web request |
-| global.nameOverride | string | `""` | if non-empty, Helm chart name to use |
-| global.ports.auth | int | `9222` | auth service internal port |
-| global.ports.blip | int | `3000` | blip service internal port |
-| global.ports.blob | int | `9225` | blob service internal port |
-| global.ports.data | int | `9220` | data service internal port |
-| global.ports.devices_grpc | int | `9228` | devices service grpc internal port |
-| global.ports.devices_http | int | `9229` | devices service http internal port |
-| global.ports.export | int | `9300` | export service internal port |
-| global.ports.gatekeeper | int | `9123` | gatekeeper service internal port |
-| global.ports.highwater | int | `9191` | highwater service internal port |
-| global.ports.hydrophone | int | `9157` | hydrophone service internal port |
-| global.ports.jellyfish | int | `9122` | jellyfish service internal port |
-| global.ports.messageapi | int | `9119` | messageapi service internal port |
-| global.ports.prescription | int | `9227` | prescription service internal port |
-| global.ports.seagull | int | `9120` | seagull service internal port |
-| global.ports.shoreline | int | `9107` | shoreline service internal port |
-| global.ports.summary | int | `9230` | summary service internal port |
-| global.ports.task | int | `9224` | task service internal port |
-| global.ports.tidewhisperer | int | `9127` | tidewhisperer service internal port |
-| global.region | string | `"us-west-2"` | aws region that services run in |
-| global.secret.enabled | bool | `false` |  |
-| global.secret.generated | bool | `false` |  |
-| global.secret.templated | bool | `false` |  |
-| tidepool.namespace.annotations | object | `{}` |  |
-| tidepool.namespace.create | bool | `true` |  |
-| tidepool.tests.enabled | bool | `false` |  |
-| tidepool.tests.job | string | `"none"` |  |
+| global.gateway.proxy.namespace | string | `"gloo-system"`   |  |
+| global.glooingress.enabled | bool | `true`            | whether to use Gloo API Gateway for ingress |
+| global.glooingress.extauth.enabled | bool | `false`           |  |
+| global.linkerdsupport.enabled | bool | `true`            | whether to include linkerdsupport subchart with Linkerd service profiles |
+| global.logLevel | string | `"info"`          | the default log level for all services |
+| global.maxTimeout | string | `"120s"`          | maximum timeout for any web request |
+| global.nameOverride | string | `""`              | if non-empty, Helm chart name to use |
+| global.ports.auth | int | `9222`            | auth service internal port |
+| global.ports.blip | int | `3000`            | blip service internal port |
+| global.ports.blob | int | `9225`            | blob service internal port |
+| global.ports.data | int | `9220`            | data service internal port |
+| global.ports.devices_grpc | int | `9228`            | devices service grpc internal port |
+| global.ports.devices_http | int | `9229`            | devices service http internal port |
+| global.ports.export | int | `9301`            | export service internal port |
+| global.ports.gatekeeper | int | `9123`            | gatekeeper service internal port |
+| global.ports.highwater | int | `9191`            | highwater service internal port |
+| global.ports.hydrophone | int | `9157`            | hydrophone service internal port |
+| global.ports.jellyfish | int | `9122`            | jellyfish service internal port |
+| global.ports.messageapi | int | `9119`            | messageapi service internal port |
+| global.ports.prescription | int | `9227`            | prescription service internal port |
+| global.ports.seagull | int | `9120`            | seagull service internal port |
+| global.ports.shoreline | int | `9107`            | shoreline service internal port |
+| global.ports.summary | int | `9230`            | summary service internal port |
+| global.ports.task | int | `9224`            | task service internal port |
+| global.ports.tidewhisperer | int | `9127`            | tidewhisperer service internal port |
+| global.region | string | `"us-west-2"`     | aws region that services run in |
+| global.secret.enabled | bool | `false`           |  |
+| global.secret.generated | bool | `false`           |  |
+| global.secret.templated | bool | `false`           |  |
+| tidepool.namespace.annotations | object | `{}`              |  |
+| tidepool.namespace.create | bool | `true`            |  |
+| tidepool.tests.enabled | bool | `false`           |  |
+| tidepool.tests.job | string | `"none"`          |  |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.3.0](https://github.com/norwoodj/helm-docs/releases/v1.3.0)

charts/tidepool/charts/clinic-worker/templates/0-configmap.yaml

@@ -8,6 +8,11 @@ metadata:
   labels:
 {{ include "charts.labels.standard" .}}
 data:
+  RedoxClientId: ""
+  RedoxSourceId: ""
+  RedoxSourceName: ""
+  RedoxTestMode: "true"
+  RedoxEnabled: "false"
   KafkaTopicPrefix: {{ .Values.configmap.data.KafkaTopicPrefix | quote }}
   KafkaTopic: {{ .Values.configmap.data.KafkaTopic | quote }}
 {{- end }}

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

@@ -100,6 +100,50 @@ spec:
               name: "clinic-worker"
               key: KafkaTopicPrefix
               optional: true
+        - name: TIDEPOOL_REDOX_KEY_ID
+          valueFrom:
+            secretKeyRef:
+              name: "clinic-worker"
+              key: RedoxKeyId
+              optional: true
+        - name: TIDEPOOL_REDOX_PRIVATE_KEY
+          valueFrom:
+            secretKeyRef:
+              name: "clinic-worker"
+              key: RedoxPrivateKey
+              optional: true
+        - name: TIDEPOOL_REDOX_CLIENT_ID
+          valueFrom:
+            configMapKeyRef:
+              name: "clinic-worker"
+              key: RedoxClientId
+              optional: true
+        - name: TIDEPOOL_REDOX_SOURCE_ID
+          valueFrom:
+            configMapKeyRef:
+              name: "clinic-worker"
+              key: RedoxSourceId
+              optional: true
+        - name: TIDEPOOL_REDOX_SOURCE_NAME
+          valueFrom:
+            configMapKeyRef:
+              name: "clinic-worker"
+              key: RedoxSourceName
+              optional: true
+        - name: TIDEPOOL_REDOX_TEST_MODE
+          valueFrom:
+            configMapKeyRef:
+              name: "clinic-worker"
+              key: RedoxTestMode
+              optional: true
+        - name: TIDEPOOL_REDOX_ENABLED
+          valueFrom:
+            configMapKeyRef:
+              name: "clinic-worker"
+              key: RedoxEnabled
+              optional: true
+        - name: TIDEPOOL_EXPORT_CLIENT_ADDRESS
+          value: "http://export:{{.Values.global.ports.export}}"
         image: "{{ .Values.deployment.image }}"
         securityContext:
           {{- .Values.podSecurityContext | toYaml | nindent 10 }}

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

@@ -63,6 +63,12 @@ spec:
           value: "http://gatekeeper:{{.Values.global.ports.gatekeeper}}"
         - name: TIDEPOOL_CONFIRMATION_CLIENT_ADDRESS
           value: "http://hydrophone:{{.Values.global.ports.hydrophone}}"
+        - name: TIDEPOOL_REDOX_VERIFICATION_TOKEN
+          valueFrom:
+            secretKeyRef:
+              name: clinic
+              key: RedoxVerificationToken
+              optional: true
         image: "{{ .Values.deployment.image }}"
         securityContext:
           {{- .Values.podSecurityContext | toYaml | nindent 10 }}

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

@@ -54,5 +54,16 @@ spec:
           upstream:
             name: clinic
             namespace: {{ .Release.Namespace }}
+    - matchers:
+        - methods:
+            - POST
+          prefix: /v1/redox
+      routeAction:
+        single:
+          upstream:
+            name: clinic
+            namespace: {{ .Release.Namespace }}
+      options:
+        prefixRewrite: {{ if not .Values.redox.verify }}/v1/redox{{ else }}/v1/redox/verify{{ end }}
   weight: 30
 {{- end }}

charts/tidepool/charts/clinic/templates/5-redox-scheduled-reports-source-kafka-connector.yaml

@@ -0,0 +1,25 @@
+{{ if .Values.global.kafka.connect.enabled }}
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaConnector
+metadata:
+  labels:
+    app: redox-scheduled-reports-source
+    strimzi.io/cluster: {{ .Release.Namespace }}-{{ .Values.global.kafka.connect.clusterName }}
+  name: redox-scheduled-reports-source
+  namespace: {{ .Release.Namespace }}
+spec:
+  class: com.mongodb.kafka.connect.MongoSourceConnector
+  config:
+    change.stream.full.document: updateLookup
+    collection: scheduledSummaryAndReportsOrders
+    connection.uri: {{ .Values.global.kafka.connect.mongoConnectionUri }}
+    copy.existing: true
+    database: clinic
+    topic.prefix: {{ .Release.Namespace }}
+    output.json.formatter: com.mongodb.kafka.connect.source.json.formatter.ExtendedJson
+    value.converter: org.apache.kafka.connect.storage.StringConverter
+    key.converter: org.apache.kafka.connect.storage.StringConverter
+    heartbeat.interval.ms: {{ .Values.global.kafka.connect.mongoHeartbeatIntervalMs }}
+    heartbeat.topic.name: {{ .Release.Namespace }}-{{ .Values.global.kafka.connect.clusterName }}-heartbeat
+  tasksMax: {{ .Values.global.kafka.connect.sourceTasksMax | int }}
+{{- end }}

charts/tidepool/charts/clinic/templates/5-redox-source-kafka-connector.yaml

@@ -0,0 +1,25 @@
+{{ if .Values.global.kafka.connect.enabled }}
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaConnector
+metadata:
+  labels:
+    app: redox-source
+    strimzi.io/cluster: {{ .Release.Namespace }}-{{ .Values.global.kafka.connect.clusterName }}
+  name: redox-source
+  namespace: {{ .Release.Namespace }}
+spec:
+  class: com.mongodb.kafka.connect.MongoSourceConnector
+  config:
+    change.stream.full.document: updateLookup
+    collection: redox
+    connection.uri: {{ .Values.global.kafka.connect.mongoConnectionUri }}
+    copy.existing: true
+    database: clinic
+    topic.prefix: {{ .Release.Namespace }}
+    output.json.formatter: com.mongodb.kafka.connect.source.json.formatter.ExtendedJson
+    value.converter: org.apache.kafka.connect.storage.StringConverter
+    key.converter: org.apache.kafka.connect.storage.StringConverter
+    heartbeat.interval.ms: {{ .Values.global.kafka.connect.mongoHeartbeatIntervalMs }}
+    heartbeat.topic.name: {{ .Release.Namespace }}-{{ .Values.global.kafka.connect.clusterName }}-heartbeat
+  tasksMax: {{ .Values.global.kafka.connect.sourceTasksMax | int }}
+{{- end }}