From 77ac45961bd9ae667c690cdd074aae18081ba548 Mon Sep 17 00:00:00 2001 From: Darin Krauss Date: Tue, 30 Dec 2025 14:28:33 -0800 Subject: [PATCH 1/5] Allow local kafka-connect build with current versions --- charts/tidepool/charts/kafka/README.md | 1 + .../charts/kafka/templates/1-kafka-connect-mongo-cluster.yaml | 2 +- charts/tidepool/charts/kafka/values.yaml | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/tidepool/charts/kafka/README.md b/charts/tidepool/charts/kafka/README.md index b038cbdb1..c659077fa 100644 --- a/charts/tidepool/charts/kafka/README.md +++ b/charts/tidepool/charts/kafka/README.md @@ -19,6 +19,7 @@ A Helm chart for Kubernetes | configmap.UserEventsTopic | string | `"user-events"` | name for the user events topic | | configmap.Version | string | `"2.4.0"` | required version of Kafka server | | configmap.enabled | bool | `true` | whether to generate a configmap | +| connect.image | string | `""` | image (registry, name, tag) to use for Kakfa connect | ---------------------------------------------- Autogenerated from chart metadata using [helm-docs v1.3.0](https://github.com/norwoodj/helm-docs/releases/v1.3.0) diff --git a/charts/tidepool/charts/kafka/templates/1-kafka-connect-mongo-cluster.yaml b/charts/tidepool/charts/kafka/templates/1-kafka-connect-mongo-cluster.yaml index 04a59b3e6..fe591e561 100644 --- a/charts/tidepool/charts/kafka/templates/1-kafka-connect-mongo-cluster.yaml +++ b/charts/tidepool/charts/kafka/templates/1-kafka-connect-mongo-cluster.yaml @@ -50,7 +50,7 @@ spec: secret: secretName: {{ .Values.keycloak.secretName }} {{- end }} - image: tidepool/connect-debezium:0.48.0-kafka-4.1.0-mongo-1.14.1-pg-1.9.6 + image: {{ .Values.connect.image | quote }} replicas: {{ .Values.global.kafka.connect.replicas | int }} {{ if .Values.global.kafka.connect.tlsEnabled }} tls: diff --git a/charts/tidepool/charts/kafka/values.yaml b/charts/tidepool/charts/kafka/values.yaml index 9b8e9953d..7a8601dde 100644 --- a/charts/tidepool/charts/kafka/values.yaml +++ b/charts/tidepool/charts/kafka/values.yaml @@ -41,6 +41,8 @@ configmap: Username: "admin" # -- required version of Kafka server Version: "2.5.0" +connect: + image: "tidepool/connect-debezium:0.48.0-kafka-4.1.0-mongo-1.14.1-pg-1.9.6" mongo: secretName: "mongo" keycloak: From 19c534bf5fea290b8afb1ffc5a05696003e603a8 Mon Sep 17 00:00:00 2001 From: Darin Krauss Date: Sun, 11 Jan 2026 19:50:11 -0800 Subject: [PATCH 2/5] [BACK-3960] Allow Tidepool user to initiate Oura C2C connection - Add Oura chart with ConfigMap and Secret - Add AcceptURL and RevokeURL to all OAuth connections - Update auth and data service environment variables - Fix typo in registry chart README.md - https://tidepool.atlassian.net/browse/BACK-3960 --- charts/tidepool/charts/abbott/README.md | 2 + .../charts/abbott/templates/0-configmap.yaml | 2 + charts/tidepool/charts/abbott/values.yaml | 2 + .../charts/auth/templates/1-deployment.yaml | 112 +++++++++++++++++- .../charts/data/templates/1-deployment.yaml | 88 +++++++++++++- charts/tidepool/charts/dexcom/README.md | 2 + .../charts/dexcom/templates/0-configmap.yaml | 2 + charts/tidepool/charts/dexcom/values.yaml | 2 + charts/tidepool/charts/oura/.helmignore | 22 ++++ charts/tidepool/charts/oura/Chart.yaml | 6 + charts/tidepool/charts/oura/README.md | 29 +++++ .../charts/oura/templates/0-configmap.yaml | 22 ++++ .../charts/oura/templates/0-secret.yaml | 16 +++ charts/tidepool/charts/oura/values.yaml | 17 +++ charts/tidepool/charts/registry/README.md | 2 +- charts/tidepool/charts/twiist/README.md | 2 + .../charts/twiist/templates/0-configmap.yaml | 2 + charts/tidepool/charts/twiist/values.yaml | 2 + 18 files changed, 327 insertions(+), 5 deletions(-) create mode 100644 charts/tidepool/charts/oura/.helmignore create mode 100644 charts/tidepool/charts/oura/Chart.yaml create mode 100644 charts/tidepool/charts/oura/README.md create mode 100644 charts/tidepool/charts/oura/templates/0-configmap.yaml create mode 100644 charts/tidepool/charts/oura/templates/0-secret.yaml create mode 100644 charts/tidepool/charts/oura/values.yaml diff --git a/charts/tidepool/charts/abbott/README.md b/charts/tidepool/charts/abbott/README.md index b8651d8b0..ba0860f55 100644 --- a/charts/tidepool/charts/abbott/README.md +++ b/charts/tidepool/charts/abbott/README.md @@ -13,7 +13,9 @@ A Helm chart for Kubernetes | configmap.enabled | bool | `false` | whether to generate a configmap | | configmap.redirectURL | string | `""` | OAuth2 redirect URL | | configmap.tokenURL | string | `""` | OAuth2 token URL | +| configmap.acceptURL | string | `""` | OAuth2 accept URL | | configmap.authorizeURL | string | `""` | OAuth2 authorization URL | +| configmap.revokeURL | string | `""` | OAuth2 revoke URL | | configmap.jwksURL | string | `""` | JWKS URL | | configmap.clientURL | string | `""` | client URL | | configmap.scopes | string | `""` | OAuth2 scopes | diff --git a/charts/tidepool/charts/abbott/templates/0-configmap.yaml b/charts/tidepool/charts/abbott/templates/0-configmap.yaml index b475637f2..d7f305794 100644 --- a/charts/tidepool/charts/abbott/templates/0-configmap.yaml +++ b/charts/tidepool/charts/abbott/templates/0-configmap.yaml @@ -13,7 +13,9 @@ data: RedirectURL: "{{include "charts.host.api" .}}/v1/oauth/abbott/redirect" {{ end }} TokenURL: {{ .Values.configmap.tokenURL | default "" }} + AcceptURL: {{ .Values.configmap.acceptURL | default "" }} AuthorizeURL: {{ .Values.configmap.authorizeURL | default "" }} + RevokeURL: {{ .Values.configmap.revokeURL | default "" }} JWKSURL: {{ .Values.configmap.jwksURL | default "" }} ClientURL: {{ .Values.configmap.clientURL | default "" }} Scopes: {{ .Values.configmap.scopes | default "" }} diff --git a/charts/tidepool/charts/abbott/values.yaml b/charts/tidepool/charts/abbott/values.yaml index fc0dbb0b2..b9aaa511c 100644 --- a/charts/tidepool/charts/abbott/values.yaml +++ b/charts/tidepool/charts/abbott/values.yaml @@ -2,7 +2,9 @@ configmap: enabled: true redirectURL: "" tokenURL: "" + acceptURL: "" authorizeURL: "" + revokeURL: "" jwksURL: "" clientURL: "" scopes: "" diff --git a/charts/tidepool/charts/auth/templates/1-deployment.yaml b/charts/tidepool/charts/auth/templates/1-deployment.yaml index 65c22644e..df69f0f2b 100644 --- a/charts/tidepool/charts/auth/templates/1-deployment.yaml +++ b/charts/tidepool/charts/auth/templates/1-deployment.yaml @@ -8,8 +8,8 @@ metadata: name: auth namespace: {{.Release.Namespace}} annotations: - secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }},abbott,dexcom,twiist,auth" - configmap.reloader.stakater.com/reload: "abbott,dexcom,twiist" + secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }},abbott,dexcom,oura,twiist,auth" + configmap.reloader.stakater.com/reload: "abbott,dexcom,oura,twiist" {{ if .Values.deployment.annotations }} {{- .Values.deployment.annotations | toYaml | nindent 4 }} {{- end }} @@ -51,6 +51,12 @@ spec: {{ include "charts.platform.env.clients" .}} {{ include "charts.kafka.common" .}} {{ include "charts.kafka.cloudevents.client" (dict "Values" .Values "Release" .Release "client" "auth") }} + - name: TIDEPOOL_SERVICE_PROVIDER_ABBOTT_ACCEPT_URL + valueFrom: + configMapKeyRef: + name: abbott + key: AcceptURL + optional: true - name: TIDEPOOL_SERVICE_PROVIDER_ABBOTT_AUTHORIZE_URL valueFrom: configMapKeyRef: @@ -75,6 +81,12 @@ spec: name: abbott key: TokenURL optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_ABBOTT_REVOKE_URL + valueFrom: + configMapKeyRef: + name: abbott + key: RevokeURL + optional: true - name: TIDEPOOL_SERVICE_PROVIDER_ABBOTT_JWKS_URL valueFrom: configMapKeyRef: @@ -101,6 +113,12 @@ spec: optional: true - name: TIDEPOOL_SERVICE_PROVIDER_ABBOTT_AUTH_STYLE_IN_PARAMS value: "true" + - name: TIDEPOOL_SERVICE_PROVIDER_DEXCOM_ACCEPT_URL + valueFrom: + configMapKeyRef: + name: dexcom + key: AcceptURL + optional: true - name: TIDEPOOL_SERVICE_PROVIDER_DEXCOM_AUTHORIZE_URL valueFrom: configMapKeyRef: @@ -125,6 +143,12 @@ spec: name: dexcom key: TokenURL optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_DEXCOM_REVOKE_URL + valueFrom: + configMapKeyRef: + name: dexcom + key: RevokeURL + optional: true - name: TIDEPOOL_SERVICE_PROVIDER_DEXCOM_CLIENT_ID valueFrom: secretKeyRef: @@ -143,6 +167,84 @@ spec: name: dexcom key: StateSalt optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_CLIENT_ID + valueFrom: + secretKeyRef: + name: oura + key: ClientId + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_CLIENT_SECRET + valueFrom: + secretKeyRef: + name: oura + key: ClientSecret + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_ACCEPT_URL + valueFrom: + configMapKeyRef: + name: oura + key: AcceptURL + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_AUTHORIZE_URL + valueFrom: + configMapKeyRef: + name: oura + key: AuthorizeURL + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_REDIRECT_URL + valueFrom: + configMapKeyRef: + name: oura + key: RedirectURL + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_TOKEN_URL + valueFrom: + configMapKeyRef: + name: oura + key: TokenURL + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_REVOKE_URL + valueFrom: + configMapKeyRef: + name: oura + key: RevokeURL + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_SCOPES + valueFrom: + configMapKeyRef: + name: oura + key: Scopes + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_STATE_SALT + valueFrom: + secretKeyRef: + name: oura + key: StateSalt + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_CLIENT_ADDRESS + valueFrom: + configMapKeyRef: + name: oura + key: ClientURL + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_PARTNER_URL + valueFrom: + configMapKeyRef: + name: oura + key: PartnerURL + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_PARTNER_SECRET + valueFrom: + secretKeyRef: + name: oura + key: PartnerSecret + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_TWIIST_ACCEPT_URL + valueFrom: + configMapKeyRef: + name: twiist + key: AcceptURL + optional: true - name: TIDEPOOL_SERVICE_PROVIDER_TWIIST_AUTHORIZE_URL valueFrom: configMapKeyRef: @@ -161,6 +263,12 @@ spec: name: twiist key: TokenURL optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_TWIIST_REVOKE_URL + valueFrom: + configMapKeyRef: + name: twiist + key: RevokeURL + optional: true - name: TIDEPOOL_SERVICE_PROVIDER_TWIIST_JWKS_URL valueFrom: configMapKeyRef: diff --git a/charts/tidepool/charts/data/templates/1-deployment.yaml b/charts/tidepool/charts/data/templates/1-deployment.yaml index fe36ae675..03b609846 100644 --- a/charts/tidepool/charts/data/templates/1-deployment.yaml +++ b/charts/tidepool/charts/data/templates/1-deployment.yaml @@ -8,8 +8,8 @@ metadata: name: data namespace: {{.Release.Namespace}} annotations: - secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }},abbott,data" - configmap.reloader.stakater.com/reload: "abbott" + secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }},abbott,oura,twiist,data" + configmap.reloader.stakater.com/reload: "abbott,oura,twiist" {{ if .Values.deployment.annotations }} {{- .Values.deployment.annotations | toYaml | nindent 4 }} {{- end }} @@ -52,6 +52,12 @@ spec: {{ include "charts.platform.env.care-partner-alerts" .}} {{ include "charts.kafka.common" .}} {{ include "charts.kafka.cloudevents.client" (dict "Values" .Values "Release" .Release "client" "data") }} + - name: TIDEPOOL_SERVICE_PROVIDER_ABBOTT_ACCEPT_URL + valueFrom: + configMapKeyRef: + name: abbott + key: AcceptURL + optional: true - name: TIDEPOOL_SERVICE_PROVIDER_ABBOTT_AUTHORIZE_URL valueFrom: configMapKeyRef: @@ -76,6 +82,12 @@ spec: name: abbott key: TokenURL optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_ABBOTT_REVOKE_URL + valueFrom: + configMapKeyRef: + name: abbott + key: RevokeURL + optional: true - name: TIDEPOOL_SERVICE_PROVIDER_ABBOTT_JWKS_URL valueFrom: configMapKeyRef: @@ -126,6 +138,78 @@ spec: name: abbott key: PartnerURL optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_CLIENT_ID + valueFrom: + secretKeyRef: + name: oura + key: ClientId + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_CLIENT_SECRET + valueFrom: + secretKeyRef: + name: oura + key: ClientSecret + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_ACCEPT_URL + valueFrom: + configMapKeyRef: + name: oura + key: AcceptURL + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_AUTHORIZE_URL + valueFrom: + configMapKeyRef: + name: oura + key: AuthorizeURL + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_REDIRECT_URL + valueFrom: + configMapKeyRef: + name: oura + key: RedirectURL + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_TOKEN_URL + valueFrom: + configMapKeyRef: + name: oura + key: TokenURL + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_REVOKE_URL + valueFrom: + configMapKeyRef: + name: oura + key: RevokeURL + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_SCOPES + valueFrom: + configMapKeyRef: + name: oura + key: Scopes + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_STATE_SALT + valueFrom: + secretKeyRef: + name: oura + key: StateSalt + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_CLIENT_ADDRESS + valueFrom: + configMapKeyRef: + name: oura + key: ClientURL + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_PARTNER_URL + valueFrom: + configMapKeyRef: + name: oura + key: PartnerURL + optional: true + - name: TIDEPOOL_SERVICE_PROVIDER_OURA_PARTNER_SECRET + valueFrom: + secretKeyRef: + name: oura + key: PartnerSecret + optional: true - name: TIDEPOOL_TWIIST_SERVICE_ACCOUNT_IDS valueFrom: configMapKeyRef: diff --git a/charts/tidepool/charts/dexcom/README.md b/charts/tidepool/charts/dexcom/README.md index 688138ea0..6dabdb224 100644 --- a/charts/tidepool/charts/dexcom/README.md +++ b/charts/tidepool/charts/dexcom/README.md @@ -11,7 +11,9 @@ A Helm chart for Kubernetes | Key | Type | Default | Description | |-----|------|---------|-------------| | configmap.enabled | bool | `true` | whether to generate a configmap | +| configmap.acceptURL | string | `""` | OAuth2 accept URL | | configmap.redirectURL | string | `""` | | +| configmap.revokeURL | string | `""` | OAuth2 revoke URL | | secret.data_.ClientId | string | `""` | plaintext Dexcom Oauth2 client id | | secret.data_.ClientSecret | string | `""` | plaintext Dexcom Oauth2 client secret | | secret.data_.StateSalt | string | `""` | plaintext Dexcom Oauth2 state salt | diff --git a/charts/tidepool/charts/dexcom/templates/0-configmap.yaml b/charts/tidepool/charts/dexcom/templates/0-configmap.yaml index ef83b2d06..bb968a8cd 100644 --- a/charts/tidepool/charts/dexcom/templates/0-configmap.yaml +++ b/charts/tidepool/charts/dexcom/templates/0-configmap.yaml @@ -13,7 +13,9 @@ data: RedirectURL: "{{include "charts.host.api" .}}/v1/oauth/dexcom/redirect" {{ end }} TokenURL: {{ .Values.configmap.tokenURL | default "https://api.dexcom.com/v1/oauth2/token" }} + AcceptURL: {{ .Values.configmap.acceptURL | default "" }} AuthorizeURL: {{ .Values.configmap.authorizeURL | default "https://api.dexcom.com/v1/oauth2/login?prompt=login" }} + RevokeURL: {{ .Values.configmap.revokeURL | default "" }} ClientURL: {{ .Values.configmap.clientURL | default "https://api.dexcom.com" }} Scopes: {{ .Values.configmap.scopes | default "offline_access" }} {{ end }} diff --git a/charts/tidepool/charts/dexcom/values.yaml b/charts/tidepool/charts/dexcom/values.yaml index a5ebb7e2b..ac56ba00f 100644 --- a/charts/tidepool/charts/dexcom/values.yaml +++ b/charts/tidepool/charts/dexcom/values.yaml @@ -11,6 +11,8 @@ secret: configmap: # -- whether to generate a configmap enabled: true + acceptURL: "" redirectURL: "" + revokeURL: "" clientURL: "https://api.dexcom.com" diff --git a/charts/tidepool/charts/oura/.helmignore b/charts/tidepool/charts/oura/.helmignore new file mode 100644 index 000000000..50af03172 --- /dev/null +++ b/charts/tidepool/charts/oura/.helmignore @@ -0,0 +1,22 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/tidepool/charts/oura/Chart.yaml b/charts/tidepool/charts/oura/Chart.yaml new file mode 100644 index 000000000..878f9299c --- /dev/null +++ b/charts/tidepool/charts/oura/Chart.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +appVersion: "1.0" +description: A Helm chart for Kubernetes +name: oura +version: 0.1.0 +home: https://github.com/tidepool-org/development/charts diff --git a/charts/tidepool/charts/oura/README.md b/charts/tidepool/charts/oura/README.md new file mode 100644 index 000000000..7a0ace4d1 --- /dev/null +++ b/charts/tidepool/charts/oura/README.md @@ -0,0 +1,29 @@ +# oura + +![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![AppVersion: 1.0](https://img.shields.io/badge/AppVersion-1.0-informational?style=flat-square) + +A Helm chart for Kubernetes + +**Homepage:** + +## Values + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| configmap.enabled | bool | `false` | whether to generate a configmap | +| configmap.acceptURL | string | `""` | OAuth2 accept URL | +| configmap.authorizeURL | string | `""` | OAuth2 authorization URL | +| configmap.redirectURL | string | `""` | OAuth2 redirect URL | +| configmap.tokenURL | string | `""` | OAuth2 token URL | +| configmap.revokeURL | string | `""` | OAuth2 revoke URL | +| configmap.scopes | string | `""` | OAuth2 scopes | +| configmap.clientURL | string | `""` | client URL | +| configmap.partnerURL | string | `""` | partner URL | +| secret.enabled | bool | `false` | whether to create a secret | +| secret.data_.clientId | string | `""` | plaintext OAuth2 client id | +| secret.data_.clientSecret | string | `""` | plaintext OAuth2 client secret | +| secret.data_.stateSalt | string | `""` | plaintext OAuth2 state salt | +| secret.data_.partnerSecret | string | `""` | plaintext partner secret | + +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.3.0](https://github.com/norwoodj/helm-docs/releases/v1.3.0) diff --git a/charts/tidepool/charts/oura/templates/0-configmap.yaml b/charts/tidepool/charts/oura/templates/0-configmap.yaml new file mode 100644 index 000000000..c595bfe9f --- /dev/null +++ b/charts/tidepool/charts/oura/templates/0-configmap.yaml @@ -0,0 +1,22 @@ +{{ if .Values.configmap.enabled }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: oura + namespace: {{ .Release.Namespace }} + labels: +{{ include "charts.labels.standard" . }} +data: + AcceptURL: {{ .Values.configmap.acceptURL | default "" }} + AuthorizeURL: {{ .Values.configmap.authorizeURL | default "" }} +{{ if .Values.configmap.redirectURL }} + RedirectURL: {{ .Values.configmap.redirectURL }} +{{ else }} + RedirectURL: "{{include "charts.host.api" .}}/v1/oauth/oura/redirect" +{{ end }} + TokenURL: {{ .Values.configmap.tokenURL | default "" }} + RevokeURL: {{ .Values.configmap.revokeURL | default "" }} + Scopes: {{ .Values.configmap.scopes | default "" }} + ClientURL: {{ .Values.configmap.clientURL | default "" }} + PartnerURL: {{ .Values.configmap.partnerURL | default "" }} +{{ end }} diff --git a/charts/tidepool/charts/oura/templates/0-secret.yaml b/charts/tidepool/charts/oura/templates/0-secret.yaml new file mode 100644 index 000000000..19fcba094 --- /dev/null +++ b/charts/tidepool/charts/oura/templates/0-secret.yaml @@ -0,0 +1,16 @@ +{{ if .Values.secret.enabled -}} +--- +apiVersion: v1 +{{ with .Values.secret.data_ -}} +data: + ClientId: {{ .clientId | default "" | b64enc | quote }} + ClientSecret: {{ .clientSecret | default "" | b64enc | quote }} + StateSalt: {{ .stateSalt | default "" | b64enc | quote }} + PartnerSecret: {{ .partnerSecret | default "" | b64enc | quote }} +{{- end }} +kind: Secret +metadata: + name: oura + namespace: {{ .Release.Namespace }} +type: Opaque +{{- end }} diff --git a/charts/tidepool/charts/oura/values.yaml b/charts/tidepool/charts/oura/values.yaml new file mode 100644 index 000000000..9453e3966 --- /dev/null +++ b/charts/tidepool/charts/oura/values.yaml @@ -0,0 +1,17 @@ +configmap: + enabled: true + acceptURL: "" + authorizeURL: "" + redirectURL: "" + tokenURL: "" + revokeURL: "" + scopes: "" + clientURL: "" + partnerURL: "" +secret: + enabled: false + data_: + clientId: "" + clientSecret: "" + stateSalt: "" + partnerSecret: "" diff --git a/charts/tidepool/charts/registry/README.md b/charts/tidepool/charts/registry/README.md index ba57253c5..e3380198b 100644 --- a/charts/tidepool/charts/registry/README.md +++ b/charts/tidepool/charts/registry/README.md @@ -1,4 +1,4 @@ -# dexcom +# registry ![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![AppVersion: 1.0](https://img.shields.io/badge/AppVersion-1.0-informational?style=flat-square) diff --git a/charts/tidepool/charts/twiist/README.md b/charts/tidepool/charts/twiist/README.md index 73cd3d2af..1887b2998 100644 --- a/charts/tidepool/charts/twiist/README.md +++ b/charts/tidepool/charts/twiist/README.md @@ -13,7 +13,9 @@ A Helm chart for Kubernetes | configmap.enabled | bool | `false` | whether to generate a configmap | | configmap.redirectURL | string | `""` | OAuth2 redirect URL | | configmap.tokenURL | string | `""` | OAuth2 token URL | +| configmap.acceptURL | string | `""` | OAuth2 accept URL | | configmap.authorizeURL | string | `""` | OAuth2 authorization URL | +| configmap.revokeURL | string | `""` | OAuth2 revoke URL | | configmap.jwksURL | string | `""` | jwks URL | | configmap.scopes | string | `""` | OAuth2 scopes | | secret.enabled | bool | `false` | whether to create a secret | diff --git a/charts/tidepool/charts/twiist/templates/0-configmap.yaml b/charts/tidepool/charts/twiist/templates/0-configmap.yaml index d7ba9ed34..c529614c9 100644 --- a/charts/tidepool/charts/twiist/templates/0-configmap.yaml +++ b/charts/tidepool/charts/twiist/templates/0-configmap.yaml @@ -13,7 +13,9 @@ data: RedirectURL: "{{include "charts.host.api" .}}/v1/oauth/twiist/redirect" {{ end }} TokenURL: {{ .Values.configmap.tokenURL | default "" }} + AcceptURL: {{ .Values.configmap.acceptURL | default "" }} AuthorizeURL: {{ .Values.configmap.authorizeURL | default "" }} + RevokeURL: {{ .Values.configmap.revokeURL | default "" }} JWKSURL: {{ .Values.configmap.jwksURL | default "" }} Scopes: {{ .Values.configmap.scopes | default "" }} ServiceAccountIDs: {{ .Values.configmap.serviceAccountIDs | default "" }} diff --git a/charts/tidepool/charts/twiist/values.yaml b/charts/tidepool/charts/twiist/values.yaml index 49db508f2..9867aecfb 100644 --- a/charts/tidepool/charts/twiist/values.yaml +++ b/charts/tidepool/charts/twiist/values.yaml @@ -2,7 +2,9 @@ configmap: enabled: false redirectURL: "" tokenURL: "" + acceptURL: "" authorizeURL: "" + revokeURL: "" scopes: "" jwksURL: "" serviceAccountIDs: "" From f3c6a9042f635e6638c237a3a4deae5bea569b3b Mon Sep 17 00:00:00 2001 From: Darin Krauss Date: Tue, 13 Jan 2026 18:27:23 -0800 Subject: [PATCH 3/5] Remove unused chart and environment variables for accept URL --- charts/tidepool/charts/abbott/README.md | 1 - .../charts/abbott/templates/0-configmap.yaml | 1 - charts/tidepool/charts/abbott/values.yaml | 1 - .../charts/auth/templates/1-deployment.yaml | 18 ------------------ .../charts/data/templates/1-deployment.yaml | 6 ------ charts/tidepool/charts/dexcom/README.md | 1 - .../charts/dexcom/templates/0-configmap.yaml | 1 - charts/tidepool/charts/dexcom/values.yaml | 1 - charts/tidepool/charts/twiist/README.md | 1 - .../charts/twiist/templates/0-configmap.yaml | 1 - charts/tidepool/charts/twiist/values.yaml | 1 - 11 files changed, 33 deletions(-) diff --git a/charts/tidepool/charts/abbott/README.md b/charts/tidepool/charts/abbott/README.md index ba0860f55..fbdf4cf6c 100644 --- a/charts/tidepool/charts/abbott/README.md +++ b/charts/tidepool/charts/abbott/README.md @@ -13,7 +13,6 @@ A Helm chart for Kubernetes | configmap.enabled | bool | `false` | whether to generate a configmap | | configmap.redirectURL | string | `""` | OAuth2 redirect URL | | configmap.tokenURL | string | `""` | OAuth2 token URL | -| configmap.acceptURL | string | `""` | OAuth2 accept URL | | configmap.authorizeURL | string | `""` | OAuth2 authorization URL | | configmap.revokeURL | string | `""` | OAuth2 revoke URL | | configmap.jwksURL | string | `""` | JWKS URL | diff --git a/charts/tidepool/charts/abbott/templates/0-configmap.yaml b/charts/tidepool/charts/abbott/templates/0-configmap.yaml index d7f305794..9f147f2f4 100644 --- a/charts/tidepool/charts/abbott/templates/0-configmap.yaml +++ b/charts/tidepool/charts/abbott/templates/0-configmap.yaml @@ -13,7 +13,6 @@ data: RedirectURL: "{{include "charts.host.api" .}}/v1/oauth/abbott/redirect" {{ end }} TokenURL: {{ .Values.configmap.tokenURL | default "" }} - AcceptURL: {{ .Values.configmap.acceptURL | default "" }} AuthorizeURL: {{ .Values.configmap.authorizeURL | default "" }} RevokeURL: {{ .Values.configmap.revokeURL | default "" }} JWKSURL: {{ .Values.configmap.jwksURL | default "" }} diff --git a/charts/tidepool/charts/abbott/values.yaml b/charts/tidepool/charts/abbott/values.yaml index b9aaa511c..f26c0cc79 100644 --- a/charts/tidepool/charts/abbott/values.yaml +++ b/charts/tidepool/charts/abbott/values.yaml @@ -2,7 +2,6 @@ configmap: enabled: true redirectURL: "" tokenURL: "" - acceptURL: "" authorizeURL: "" revokeURL: "" jwksURL: "" diff --git a/charts/tidepool/charts/auth/templates/1-deployment.yaml b/charts/tidepool/charts/auth/templates/1-deployment.yaml index df69f0f2b..1384c69ff 100644 --- a/charts/tidepool/charts/auth/templates/1-deployment.yaml +++ b/charts/tidepool/charts/auth/templates/1-deployment.yaml @@ -51,12 +51,6 @@ spec: {{ include "charts.platform.env.clients" .}} {{ include "charts.kafka.common" .}} {{ include "charts.kafka.cloudevents.client" (dict "Values" .Values "Release" .Release "client" "auth") }} - - name: TIDEPOOL_SERVICE_PROVIDER_ABBOTT_ACCEPT_URL - valueFrom: - configMapKeyRef: - name: abbott - key: AcceptURL - optional: true - name: TIDEPOOL_SERVICE_PROVIDER_ABBOTT_AUTHORIZE_URL valueFrom: configMapKeyRef: @@ -113,12 +107,6 @@ spec: optional: true - name: TIDEPOOL_SERVICE_PROVIDER_ABBOTT_AUTH_STYLE_IN_PARAMS value: "true" - - name: TIDEPOOL_SERVICE_PROVIDER_DEXCOM_ACCEPT_URL - valueFrom: - configMapKeyRef: - name: dexcom - key: AcceptURL - optional: true - name: TIDEPOOL_SERVICE_PROVIDER_DEXCOM_AUTHORIZE_URL valueFrom: configMapKeyRef: @@ -239,12 +227,6 @@ spec: name: oura key: PartnerSecret optional: true - - name: TIDEPOOL_SERVICE_PROVIDER_TWIIST_ACCEPT_URL - valueFrom: - configMapKeyRef: - name: twiist - key: AcceptURL - optional: true - name: TIDEPOOL_SERVICE_PROVIDER_TWIIST_AUTHORIZE_URL valueFrom: configMapKeyRef: diff --git a/charts/tidepool/charts/data/templates/1-deployment.yaml b/charts/tidepool/charts/data/templates/1-deployment.yaml index 03b609846..8e3c25b7b 100644 --- a/charts/tidepool/charts/data/templates/1-deployment.yaml +++ b/charts/tidepool/charts/data/templates/1-deployment.yaml @@ -52,12 +52,6 @@ spec: {{ include "charts.platform.env.care-partner-alerts" .}} {{ include "charts.kafka.common" .}} {{ include "charts.kafka.cloudevents.client" (dict "Values" .Values "Release" .Release "client" "data") }} - - name: TIDEPOOL_SERVICE_PROVIDER_ABBOTT_ACCEPT_URL - valueFrom: - configMapKeyRef: - name: abbott - key: AcceptURL - optional: true - name: TIDEPOOL_SERVICE_PROVIDER_ABBOTT_AUTHORIZE_URL valueFrom: configMapKeyRef: diff --git a/charts/tidepool/charts/dexcom/README.md b/charts/tidepool/charts/dexcom/README.md index 6dabdb224..e96359dbe 100644 --- a/charts/tidepool/charts/dexcom/README.md +++ b/charts/tidepool/charts/dexcom/README.md @@ -11,7 +11,6 @@ A Helm chart for Kubernetes | Key | Type | Default | Description | |-----|------|---------|-------------| | configmap.enabled | bool | `true` | whether to generate a configmap | -| configmap.acceptURL | string | `""` | OAuth2 accept URL | | configmap.redirectURL | string | `""` | | | configmap.revokeURL | string | `""` | OAuth2 revoke URL | | secret.data_.ClientId | string | `""` | plaintext Dexcom Oauth2 client id | diff --git a/charts/tidepool/charts/dexcom/templates/0-configmap.yaml b/charts/tidepool/charts/dexcom/templates/0-configmap.yaml index bb968a8cd..26d9b0b82 100644 --- a/charts/tidepool/charts/dexcom/templates/0-configmap.yaml +++ b/charts/tidepool/charts/dexcom/templates/0-configmap.yaml @@ -13,7 +13,6 @@ data: RedirectURL: "{{include "charts.host.api" .}}/v1/oauth/dexcom/redirect" {{ end }} TokenURL: {{ .Values.configmap.tokenURL | default "https://api.dexcom.com/v1/oauth2/token" }} - AcceptURL: {{ .Values.configmap.acceptURL | default "" }} AuthorizeURL: {{ .Values.configmap.authorizeURL | default "https://api.dexcom.com/v1/oauth2/login?prompt=login" }} RevokeURL: {{ .Values.configmap.revokeURL | default "" }} ClientURL: {{ .Values.configmap.clientURL | default "https://api.dexcom.com" }} diff --git a/charts/tidepool/charts/dexcom/values.yaml b/charts/tidepool/charts/dexcom/values.yaml index ac56ba00f..0434b48d8 100644 --- a/charts/tidepool/charts/dexcom/values.yaml +++ b/charts/tidepool/charts/dexcom/values.yaml @@ -11,7 +11,6 @@ secret: configmap: # -- whether to generate a configmap enabled: true - acceptURL: "" redirectURL: "" revokeURL: "" clientURL: "https://api.dexcom.com" diff --git a/charts/tidepool/charts/twiist/README.md b/charts/tidepool/charts/twiist/README.md index 1887b2998..06ca40393 100644 --- a/charts/tidepool/charts/twiist/README.md +++ b/charts/tidepool/charts/twiist/README.md @@ -13,7 +13,6 @@ A Helm chart for Kubernetes | configmap.enabled | bool | `false` | whether to generate a configmap | | configmap.redirectURL | string | `""` | OAuth2 redirect URL | | configmap.tokenURL | string | `""` | OAuth2 token URL | -| configmap.acceptURL | string | `""` | OAuth2 accept URL | | configmap.authorizeURL | string | `""` | OAuth2 authorization URL | | configmap.revokeURL | string | `""` | OAuth2 revoke URL | | configmap.jwksURL | string | `""` | jwks URL | diff --git a/charts/tidepool/charts/twiist/templates/0-configmap.yaml b/charts/tidepool/charts/twiist/templates/0-configmap.yaml index c529614c9..fb2b77d76 100644 --- a/charts/tidepool/charts/twiist/templates/0-configmap.yaml +++ b/charts/tidepool/charts/twiist/templates/0-configmap.yaml @@ -13,7 +13,6 @@ data: RedirectURL: "{{include "charts.host.api" .}}/v1/oauth/twiist/redirect" {{ end }} TokenURL: {{ .Values.configmap.tokenURL | default "" }} - AcceptURL: {{ .Values.configmap.acceptURL | default "" }} AuthorizeURL: {{ .Values.configmap.authorizeURL | default "" }} RevokeURL: {{ .Values.configmap.revokeURL | default "" }} JWKSURL: {{ .Values.configmap.jwksURL | default "" }} diff --git a/charts/tidepool/charts/twiist/values.yaml b/charts/tidepool/charts/twiist/values.yaml index 9867aecfb..a89bea7b4 100644 --- a/charts/tidepool/charts/twiist/values.yaml +++ b/charts/tidepool/charts/twiist/values.yaml @@ -2,7 +2,6 @@ configmap: enabled: false redirectURL: "" tokenURL: "" - acceptURL: "" authorizeURL: "" revokeURL: "" scopes: "" From f1db5b9db207088e9dd48a282ecf09f88b7a5504 Mon Sep 17 00:00:00 2001 From: Todd Kazakov Date: Thu, 29 Jan 2026 23:17:30 +0200 Subject: [PATCH 4/5] Add config for jotform and customer.io (#341) * Add config for jotform and customer.io * Move customer.io related config to a dedicated sub-chart --- .../charts/auth/templates/1-deployment.yaml | 52 ++++++++++++++++++- .../charts/auth/templates/4-routetable.yaml | 16 ++++++ .../tidepool/charts/customer-io/.helmignore | 22 ++++++++ charts/tidepool/charts/customer-io/Chart.yaml | 6 +++ charts/tidepool/charts/customer-io/README.md | 18 +++++++ .../customer-io/templates/0-secret.yaml | 14 +++++ .../tidepool/charts/customer-io/values.yaml | 8 +++ charts/tidepool/charts/oura/README.md | 20 ++++--- .../charts/oura/templates/0-configmap.yaml | 3 ++ .../charts/oura/templates/0-secret.yaml | 3 ++ charts/tidepool/charts/oura/values.yaml | 26 ++++++++++ 11 files changed, 179 insertions(+), 9 deletions(-) create mode 100644 charts/tidepool/charts/customer-io/.helmignore create mode 100644 charts/tidepool/charts/customer-io/Chart.yaml create mode 100644 charts/tidepool/charts/customer-io/README.md create mode 100644 charts/tidepool/charts/customer-io/templates/0-secret.yaml create mode 100644 charts/tidepool/charts/customer-io/values.yaml diff --git a/charts/tidepool/charts/auth/templates/1-deployment.yaml b/charts/tidepool/charts/auth/templates/1-deployment.yaml index 1384c69ff..5afef9bd9 100644 --- a/charts/tidepool/charts/auth/templates/1-deployment.yaml +++ b/charts/tidepool/charts/auth/templates/1-deployment.yaml @@ -8,8 +8,8 @@ metadata: name: auth namespace: {{.Release.Namespace}} annotations: - secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }},abbott,dexcom,oura,twiist,auth" - configmap.reloader.stakater.com/reload: "abbott,dexcom,oura,twiist" + secret.reloader.stakater.com/reload: "auth,server,{{ .Values.mongo.secretName }},abbott,customer-io,dexcom,oura,twiist" + configmap.reloader.stakater.com/reload: "abbott,auth,dexcom,oura,twiist" {{ if .Values.deployment.annotations }} {{- .Values.deployment.annotations | toYaml | nindent 4 }} {{- end }} @@ -410,6 +410,54 @@ spec: name: palmtree key: tlsKeyData optional: true + - name: TIDEPOOL_OURA_JOTFORM_API_KEY + valueFrom: + secretKeyRef: + name: oura + key: JotformAPIKey + optional: true + - name: TIDEPOOL_OURA_JOTFORM_BASE_URL + valueFrom: + configMapKeyRef: + name: oura + key: JotformBaseURL + optional: true + - name: TIDEPOOL_OURA_JOTFORM_FORM_ID + valueFrom: + configMapKeyRef: + name: oura + key: JotformFormId + optional: true + - name: TIDEPOOL_CUSTOMERIO_APP_API_KEY + valueFrom: + secretKeyRef: + name: customer-io + key: CustomerIOAppAPIKey + optional: true + - name: TIDEPOOL_CUSTOMERIO_TRACK_API_KEY + valueFrom: + secretKeyRef: + name: customer-io + key: CustomerIOTrackAPIKey + optional: true + - name: TIDEPOOL_OURA_SHOPIFY_STORE_ID + valueFrom: + configMapKeyRef: + name: oura + key: ShopifyStoreId + optional: true + - name: TIDEPOOL_OURA_SHOPIFY_CLIENT_ID + valueFrom: + secretKeyRef: + name: oura + key: ShopifyClientId + optional: true + - name: TIDEPOOL_OURA_SHOPIFY_CLIENT_SECRET + valueFrom: + secretKeyRef: + name: oura + key: ShopifyClientSecret + optional: true {{- range $key, $val := ((.Values.deployment).extraEnv | default ((.Values.global).deployment).extraEnv | default (dict)) }} - name: {{ $key }} value: {{ $val | quote }} diff --git a/charts/tidepool/charts/auth/templates/4-routetable.yaml b/charts/tidepool/charts/auth/templates/4-routetable.yaml index 0541d0488..054fc8088 100644 --- a/charts/tidepool/charts/auth/templates/4-routetable.yaml +++ b/charts/tidepool/charts/auth/templates/4-routetable.yaml @@ -152,6 +152,22 @@ spec: single: upstream: name: auth + - matchers: + - methods: + - POST + regex: /v1/partners/jotform/[^/]+ + routeAction: + single: + upstream: + name: auth + - matchers: + - methods: + - POST + prefix: /v1/partners/shopify/ + routeAction: + single: + upstream: + name: auth - matchers: - methods: - GET diff --git a/charts/tidepool/charts/customer-io/.helmignore b/charts/tidepool/charts/customer-io/.helmignore new file mode 100644 index 000000000..50af03172 --- /dev/null +++ b/charts/tidepool/charts/customer-io/.helmignore @@ -0,0 +1,22 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/tidepool/charts/customer-io/Chart.yaml b/charts/tidepool/charts/customer-io/Chart.yaml new file mode 100644 index 000000000..0dd7c8bd6 --- /dev/null +++ b/charts/tidepool/charts/customer-io/Chart.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +appVersion: "1.0" +description: A Helm chart for Kubernetes +name: customer-io +version: 0.1.0 +home: https://github.com/tidepool-org/development/charts diff --git a/charts/tidepool/charts/customer-io/README.md b/charts/tidepool/charts/customer-io/README.md new file mode 100644 index 000000000..12c816ebd --- /dev/null +++ b/charts/tidepool/charts/customer-io/README.md @@ -0,0 +1,18 @@ +# customer-io + +![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![AppVersion: 1.0](https://img.shields.io/badge/AppVersion-1.0-informational?style=flat-square) + +A Helm chart for Kubernetes + +**Homepage:** + +## Values + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| secret.data_.customerIOAppAPIKey | string | `""` | API key customer.io's App API | +| secret.data_.customerIOTrackAPIKey | string | `""` | API key customer.io's Track API | +| secret.enabled | bool | `false` | whether to generate a secret | + +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/tidepool/charts/customer-io/templates/0-secret.yaml b/charts/tidepool/charts/customer-io/templates/0-secret.yaml new file mode 100644 index 000000000..b655647f3 --- /dev/null +++ b/charts/tidepool/charts/customer-io/templates/0-secret.yaml @@ -0,0 +1,14 @@ +{{ if .Values.secret.enabled -}} +--- +apiVersion: v1 +{{ with .Values.secret.data_ -}} +data: + CustomerIOAppAPIKey: {{ .customerIOAppAPIKey | default "" | b64enc | quote }} + CustomerIOTrackAPIKey: {{ .customerIOTrackAPIKey | default "" | b64enc | quote }} +{{- end }} +kind: Secret +metadata: + name: customer-io + namespace: {{ .Release.Namespace }} +type: Opaque +{{- end }} diff --git a/charts/tidepool/charts/customer-io/values.yaml b/charts/tidepool/charts/customer-io/values.yaml new file mode 100644 index 000000000..2f17112c5 --- /dev/null +++ b/charts/tidepool/charts/customer-io/values.yaml @@ -0,0 +1,8 @@ +secret: + # -- whether to generate a secret + enabled: false + data_: + # -- API key customer.io's App API + customerIOAppAPIKey: "" + # -- API key customer.io's Track API + customerIOTrackAPIKey: "" \ No newline at end of file diff --git a/charts/tidepool/charts/oura/README.md b/charts/tidepool/charts/oura/README.md index 7a0ace4d1..893405d24 100644 --- a/charts/tidepool/charts/oura/README.md +++ b/charts/tidepool/charts/oura/README.md @@ -10,20 +10,26 @@ A Helm chart for Kubernetes | Key | Type | Default | Description | |-----|------|---------|-------------| -| configmap.enabled | bool | `false` | whether to generate a configmap | | configmap.acceptURL | string | `""` | OAuth2 accept URL | | configmap.authorizeURL | string | `""` | OAuth2 authorization URL | +| configmap.clientURL | string | `""` | client URL | +| configmap.enabled | bool | `true` | whether to generate a configmap | +| configmap.jotformBaseURL | string | `""` | jotform base URL | +| configmap.jotformFormId | string | `""` | jotform OURA eligibility form ID | +| configmap.partnerURL | string | `""` | partner URL | | configmap.redirectURL | string | `""` | OAuth2 redirect URL | -| configmap.tokenURL | string | `""` | OAuth2 token URL | | configmap.revokeURL | string | `""` | OAuth2 revoke URL | | configmap.scopes | string | `""` | OAuth2 scopes | -| configmap.clientURL | string | `""` | client URL | -| configmap.partnerURL | string | `""` | partner URL | -| secret.enabled | bool | `false` | whether to create a secret | +| configmap.shopifyStoreId | string | `""` | shopify store ID | +| configmap.tokenURL | string | `""` | OAuth2 token URL | | secret.data_.clientId | string | `""` | plaintext OAuth2 client id | | secret.data_.clientSecret | string | `""` | plaintext OAuth2 client secret | -| secret.data_.stateSalt | string | `""` | plaintext OAuth2 state salt | +| secret.data_.jotformAPIKey | string | `""` | jotform API Key | | secret.data_.partnerSecret | string | `""` | plaintext partner secret | +| secret.data_.shopifyClientId | string | `""` | plaintext Shopify Client ID | +| secret.data_.shopifyClientSecret | string | `""` | plaintext Shopify Client Secret | +| secret.data_.stateSalt | string | `""` | plaintext OAuth2 state salt | +| secret.enabled | bool | `false` | whether to create a secret | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.3.0](https://github.com/norwoodj/helm-docs/releases/v1.3.0) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/tidepool/charts/oura/templates/0-configmap.yaml b/charts/tidepool/charts/oura/templates/0-configmap.yaml index c595bfe9f..8e1ef329b 100644 --- a/charts/tidepool/charts/oura/templates/0-configmap.yaml +++ b/charts/tidepool/charts/oura/templates/0-configmap.yaml @@ -19,4 +19,7 @@ data: Scopes: {{ .Values.configmap.scopes | default "" }} ClientURL: {{ .Values.configmap.clientURL | default "" }} PartnerURL: {{ .Values.configmap.partnerURL | default "" }} + JotformBaseURL: "{{ .Values.configmap.jotformBaseURL | default "" }}" + JotformFormId: "{{ .Values.configmap.jotformFormId | default "" }}" + ShopifyStoreId: "{{ .Values.configmap.shopifyStoreId | default "" }}" {{ end }} diff --git a/charts/tidepool/charts/oura/templates/0-secret.yaml b/charts/tidepool/charts/oura/templates/0-secret.yaml index 19fcba094..24fe491b8 100644 --- a/charts/tidepool/charts/oura/templates/0-secret.yaml +++ b/charts/tidepool/charts/oura/templates/0-secret.yaml @@ -7,6 +7,9 @@ data: ClientSecret: {{ .clientSecret | default "" | b64enc | quote }} StateSalt: {{ .stateSalt | default "" | b64enc | quote }} PartnerSecret: {{ .partnerSecret | default "" | b64enc | quote }} + JotformAPIKey: {{ .jotformAPIKey | default "" | b64enc | quote }} + ShopifyClientId: {{ .shopifyClientId | default "" | b64enc | quote }} + ShopifyClientSecret: {{ .shopifyClientSecret | default "" | b64enc | quote }} {{- end }} kind: Secret metadata: diff --git a/charts/tidepool/charts/oura/values.yaml b/charts/tidepool/charts/oura/values.yaml index 9453e3966..6b6fb6c24 100644 --- a/charts/tidepool/charts/oura/values.yaml +++ b/charts/tidepool/charts/oura/values.yaml @@ -1,17 +1,43 @@ configmap: + # -- whether to generate a configmap enabled: true + # -- OAuth2 accept URL acceptURL: "" + # -- OAuth2 authorization URL authorizeURL: "" + # -- OAuth2 redirect URL redirectURL: "" + # -- OAuth2 token URL tokenURL: "" + # -- OAuth2 revoke URL revokeURL: "" + # -- OAuth2 scopes scopes: "" + # -- client URL clientURL: "" + # -- partner URL partnerURL: "" + # -- jotform base URL + jotformBaseURL: "" + # -- jotform OURA eligibility form ID + jotformFormId: "" + # -- shopify store ID + shopifyStoreId: "" secret: + # -- whether to create a secret enabled: false data_: + # -- plaintext OAuth2 client id clientId: "" + # -- plaintext OAuth2 client secret clientSecret: "" + # -- plaintext OAuth2 state salt stateSalt: "" + # -- plaintext partner secret partnerSecret: "" + # -- jotform API Key + jotformAPIKey: "" + # -- plaintext Shopify Client ID + shopifyClientId: "" + # -- plaintext Shopify Client Secret + shopifyClientSecret: "" \ No newline at end of file From 83694ba05a7267cee5276758415bda684a2bd2bf Mon Sep 17 00:00:00 2001 From: Todd Kazakov Date: Fri, 30 Jan 2026 10:02:31 +0200 Subject: [PATCH 5/5] Add customer io site id (#342) --- .../tidepool/charts/auth/templates/1-deployment.yaml | 12 +++++++++--- .../charts/customer-io/templates/0-configmap.yaml | 11 +++++++++++ .../charts/customer-io/templates/0-secret.yaml | 4 ++-- charts/tidepool/charts/customer-io/values.yaml | 9 +++++++-- 4 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 charts/tidepool/charts/customer-io/templates/0-configmap.yaml diff --git a/charts/tidepool/charts/auth/templates/1-deployment.yaml b/charts/tidepool/charts/auth/templates/1-deployment.yaml index 5afef9bd9..ab5bec174 100644 --- a/charts/tidepool/charts/auth/templates/1-deployment.yaml +++ b/charts/tidepool/charts/auth/templates/1-deployment.yaml @@ -9,7 +9,7 @@ metadata: namespace: {{.Release.Namespace}} annotations: secret.reloader.stakater.com/reload: "auth,server,{{ .Values.mongo.secretName }},abbott,customer-io,dexcom,oura,twiist" - configmap.reloader.stakater.com/reload: "abbott,auth,dexcom,oura,twiist" + configmap.reloader.stakater.com/reload: "abbott,auth,customer-io,dexcom,oura,twiist" {{ if .Values.deployment.annotations }} {{- .Values.deployment.annotations | toYaml | nindent 4 }} {{- end }} @@ -428,17 +428,23 @@ spec: name: oura key: JotformFormId optional: true + - name: TIDEPOOL_CUSTOMERIO_SITE_ID + valueFrom: + configMapKeyRef: + name: customer-io + key: SiteId + optional: true - name: TIDEPOOL_CUSTOMERIO_APP_API_KEY valueFrom: secretKeyRef: name: customer-io - key: CustomerIOAppAPIKey + key: AppAPIKey optional: true - name: TIDEPOOL_CUSTOMERIO_TRACK_API_KEY valueFrom: secretKeyRef: name: customer-io - key: CustomerIOTrackAPIKey + key: TrackAPIKey optional: true - name: TIDEPOOL_OURA_SHOPIFY_STORE_ID valueFrom: diff --git a/charts/tidepool/charts/customer-io/templates/0-configmap.yaml b/charts/tidepool/charts/customer-io/templates/0-configmap.yaml new file mode 100644 index 000000000..9b7d93c62 --- /dev/null +++ b/charts/tidepool/charts/customer-io/templates/0-configmap.yaml @@ -0,0 +1,11 @@ +{{ if .Values.configmap.enabled }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: customer-io + namespace: {{ .Release.Namespace }} + labels: +{{ include "charts.labels.standard" . }} +data: + SiteId: "{{ .Values.configmap.siteId | default "" }}" +{{ end }} diff --git a/charts/tidepool/charts/customer-io/templates/0-secret.yaml b/charts/tidepool/charts/customer-io/templates/0-secret.yaml index b655647f3..a5bcf6d2e 100644 --- a/charts/tidepool/charts/customer-io/templates/0-secret.yaml +++ b/charts/tidepool/charts/customer-io/templates/0-secret.yaml @@ -3,8 +3,8 @@ apiVersion: v1 {{ with .Values.secret.data_ -}} data: - CustomerIOAppAPIKey: {{ .customerIOAppAPIKey | default "" | b64enc | quote }} - CustomerIOTrackAPIKey: {{ .customerIOTrackAPIKey | default "" | b64enc | quote }} + AppAPIKey: {{ .appAPIKey | default "" | b64enc | quote }} + TrackAPIKey: {{ .trackAPIKey | default "" | b64enc | quote }} {{- end }} kind: Secret metadata: diff --git a/charts/tidepool/charts/customer-io/values.yaml b/charts/tidepool/charts/customer-io/values.yaml index 2f17112c5..ce82cb903 100644 --- a/charts/tidepool/charts/customer-io/values.yaml +++ b/charts/tidepool/charts/customer-io/values.yaml @@ -3,6 +3,11 @@ secret: enabled: false data_: # -- API key customer.io's App API - customerIOAppAPIKey: "" + appAPIKey: "" # -- API key customer.io's Track API - customerIOTrackAPIKey: "" \ No newline at end of file + trackAPIKey: "" +configmap: + # -- whether to generate a configmap + enabled: true + # -- Customer.io site ID + siteId: "" \ No newline at end of file