From 3db5132ec7440e4186a22c994e179ffafc317f0c Mon Sep 17 00:00:00 2001 From: Pauline Date: Wed, 25 Oct 2023 12:59:11 +0100 Subject: [PATCH 1/3] Update rest-sources versions and add Oura vars to values.yaml --- .../radar-rest-sources-authorizer/Chart.yaml | 4 ++-- .../radar-rest-sources-authorizer/README.md | 4 ++-- .../radar-rest-sources-authorizer/values.yaml | 2 +- charts/radar-rest-sources-backend/Chart.yaml | 4 ++-- charts/radar-rest-sources-backend/README.md | 4 ++-- charts/radar-rest-sources-backend/values.yaml | 19 ++++++++++++++++++- 6 files changed, 27 insertions(+), 10 deletions(-) diff --git a/charts/radar-rest-sources-authorizer/Chart.yaml b/charts/radar-rest-sources-authorizer/Chart.yaml index 617163e6..1e445cf0 100644 --- a/charts/radar-rest-sources-authorizer/Chart.yaml +++ b/charts/radar-rest-sources-authorizer/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "4.3.0" +appVersion: "4.4.0" description: A Helm chart for the front-end application of RADAR-base Rest Sources Authorizer which is a portal to authorize the Fitbit connector to read data from Fitbit accounts. name: radar-rest-sources-authorizer -version: 1.0.2 +version: 1.0.3 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-rest-sources-authorizer diff --git a/charts/radar-rest-sources-authorizer/README.md b/charts/radar-rest-sources-authorizer/README.md index d5c5ac9c..f884692d 100644 --- a/charts/radar-rest-sources-authorizer/README.md +++ b/charts/radar-rest-sources-authorizer/README.md @@ -3,7 +3,7 @@ # radar-rest-sources-authorizer [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-rest-sources-authorizer)](https://artifacthub.io/packages/helm/radar-base/radar-rest-sources-authorizer) -![Version: 1.0.2](https://img.shields.io/badge/Version-1.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.0](https://img.shields.io/badge/AppVersion-4.3.0-informational?style=flat-square) +![Version: 1.0.3](https://img.shields.io/badge/Version-1.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.4.0](https://img.shields.io/badge/AppVersion-4.4.0-informational?style=flat-square) A Helm chart for the front-end application of RADAR-base Rest Sources Authorizer which is a portal to authorize the Fitbit connector to read data from Fitbit accounts. @@ -33,7 +33,7 @@ A Helm chart for the front-end application of RADAR-base Rest Sources Authorizer |-----|------|---------|-------------| | replicaCount | int | `2` | Number of radar-rest-sources-authorizer replicas to deploy | | image.repository | string | `"radarbase/radar-rest-source-authorizer"` | radar-rest-sources-authorizer image repository | -| image.tag | string | `"4.3.0"` | radar-rest-sources-authorizer image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.tag | string | `"4.4.0"` | radar-rest-sources-authorizer image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | | image.pullPolicy | string | `"IfNotPresent"` | radar-rest-sources-authorizer image pull policy | | imagePullSecrets | list | `[]` | Docker registry secret names as an array | | nameOverride | string | `""` | String to partially override radar-rest-sources-authorizer.fullname template with a string (will prepend the release name) | diff --git a/charts/radar-rest-sources-authorizer/values.yaml b/charts/radar-rest-sources-authorizer/values.yaml index 922bdc82..475d7599 100644 --- a/charts/radar-rest-sources-authorizer/values.yaml +++ b/charts/radar-rest-sources-authorizer/values.yaml @@ -10,7 +10,7 @@ image: repository: radarbase/radar-rest-source-authorizer # -- radar-rest-sources-authorizer image tag (immutable tags are recommended) # Overrides the image tag whose default is the chart appVersion. - tag: 4.3.0 + tag: 4.4.0 # -- radar-rest-sources-authorizer image pull policy pullPolicy: IfNotPresent diff --git a/charts/radar-rest-sources-backend/Chart.yaml b/charts/radar-rest-sources-backend/Chart.yaml index b17ad862..97f629e0 100644 --- a/charts/radar-rest-sources-backend/Chart.yaml +++ b/charts/radar-rest-sources-backend/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "4.3.0" +appVersion: "4.4.0" description: A Helm chart for the backend application of RADAR-base Rest Sources Authorizer name: radar-rest-sources-backend -version: 1.0.3 +version: 1.0.4 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-rest-sources-backend diff --git a/charts/radar-rest-sources-backend/README.md b/charts/radar-rest-sources-backend/README.md index 990bb40b..405ca8ca 100644 --- a/charts/radar-rest-sources-backend/README.md +++ b/charts/radar-rest-sources-backend/README.md @@ -3,7 +3,7 @@ # radar-rest-sources-backend [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-rest-sources-backend)](https://artifacthub.io/packages/helm/radar-base/radar-rest-sources-backend) -![Version: 1.0.3](https://img.shields.io/badge/Version-1.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.0](https://img.shields.io/badge/AppVersion-4.3.0-informational?style=flat-square) +![Version: 1.0.4](https://img.shields.io/badge/Version-1.0.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.4.0](https://img.shields.io/badge/AppVersion-4.4.0-informational?style=flat-square) A Helm chart for the backend application of RADAR-base Rest Sources Authorizer @@ -33,7 +33,7 @@ A Helm chart for the backend application of RADAR-base Rest Sources Authorizer |-----|------|---------|-------------| | replicaCount | int | `2` | Number of radar-rest-sources-backend replicas to deploy | | image.repository | string | `"radarbase/radar-rest-source-auth-backend"` | radar-rest-sources-backend image repository | -| image.tag | string | `"4.3.0"` | radar-rest-sources-backend image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.tag | string | `"4.4.0"` | radar-rest-sources-backend image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | | image.pullPolicy | string | `"IfNotPresent"` | radar-rest-sources-backend image pull policy | | imagePullSecrets | list | `[]` | Docker registry secret names as an array | | nameOverride | string | `""` | String to partially override radar-rest-sources-backend.fullname template with a string (will prepend the release name) | diff --git a/charts/radar-rest-sources-backend/values.yaml b/charts/radar-rest-sources-backend/values.yaml index a026d578..197d1c04 100644 --- a/charts/radar-rest-sources-backend/values.yaml +++ b/charts/radar-rest-sources-backend/values.yaml @@ -10,7 +10,7 @@ image: repository: radarbase/radar-rest-source-auth-backend # -- radar-rest-sources-backend image tag (immutable tags are recommended) # Overrides the image tag whose default is the chart appVersion. - tag: 4.3.0 + tag: 4.4.0 # -- radar-rest-sources-backend image pull policy pullPolicy: IfNotPresent @@ -205,3 +205,20 @@ restSourceClients: clientSecret: Garmin-clientsecret # -- List of scopes of the data that should be collected from Garmin. scope: activity heartrate sleep profile + + oura: + # -- set to true, if Oura client should be used + enable: true + # -- Type of the data sources + sourceType: Oura + # -- Authorization endpoint for Oura authentication and authorization + authorizationEndpoint: https://cloud.ouraring.com/oauth/authorize + # -- Token endpoint to request access-token from Oura + tokenEndpoint: https://api.ouraring.com/oauth/token + deregistrationEndpoint: https://api.ouraring.com/oauth/revoke + # -- Oura client id + clientId: Oura-clientid + # -- Oura client secret + clientSecret: Oura-clientsecret + # -- List of scopes of the data that should be collected from Oura. For details, please refer to https://cloud.ouraring.com/docs/authentication + scope: daily session heartrate workout tag personal email spo2 ring_configuration \ No newline at end of file From 41f3ca16b5fa9b7f12a7494487fe60abdf15b229 Mon Sep 17 00:00:00 2001 From: Pauline Date: Wed, 25 Oct 2023 14:02:38 +0100 Subject: [PATCH 2/3] Fix lint issues --- charts/radar-rest-sources-backend/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/radar-rest-sources-backend/values.yaml b/charts/radar-rest-sources-backend/values.yaml index 197d1c04..035a3b3f 100644 --- a/charts/radar-rest-sources-backend/values.yaml +++ b/charts/radar-rest-sources-backend/values.yaml @@ -221,4 +221,4 @@ restSourceClients: # -- Oura client secret clientSecret: Oura-clientsecret # -- List of scopes of the data that should be collected from Oura. For details, please refer to https://cloud.ouraring.com/docs/authentication - scope: daily session heartrate workout tag personal email spo2 ring_configuration \ No newline at end of file + scope: daily session heartrate workout tag personal email spo2 ring_configuration From 55325351c37f5df6dc759506da20db5df64bba34 Mon Sep 17 00:00:00 2001 From: Pauline Date: Wed, 25 Oct 2023 14:13:37 +0100 Subject: [PATCH 3/3] Update rest-sources-backend README --- charts/radar-rest-sources-backend/README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/charts/radar-rest-sources-backend/README.md b/charts/radar-rest-sources-backend/README.md index 405ca8ca..e7ec2ba0 100644 --- a/charts/radar-rest-sources-backend/README.md +++ b/charts/radar-rest-sources-backend/README.md @@ -98,3 +98,11 @@ A Helm chart for the backend application of RADAR-base Rest Sources Authorizer | restSourceClients.garmin.clientId | string | `"Garmin-clientid"` | Garmin client id | | restSourceClients.garmin.clientSecret | string | `"Garmin-clientsecret"` | Garmin client secret | | restSourceClients.garmin.scope | string | `"activity heartrate sleep profile"` | List of scopes of the data that should be collected from Garmin. | +| restSourceClients.oura.enable | bool | `true` | set to true, if Oura client should be used | +| restSourceClients.oura.sourceType | string | `"Oura"` | Type of the data sources | +| restSourceClients.oura.authorizationEndpoint | string | `"https://cloud.ouraring.com/oauth/authorize"` | Authorization endpoint for Oura authentication and authorization | +| restSourceClients.oura.tokenEndpoint | string | `"https://api.ouraring.com/oauth/token"` | Token endpoint to request access-token from Oura | +| restSourceClients.oura.deregistrationEndpoint | string | `"https://api.ouraring.com/oauth/revoke"` | | +| restSourceClients.oura.clientId | string | `"Oura-clientid"` | Oura client id | +| restSourceClients.oura.clientSecret | string | `"Oura-clientsecret"` | Oura client secret | +| restSourceClients.oura.scope | string | `"daily session heartrate workout tag personal email spo2 ring_configuration"` | List of scopes of the data that should be collected from Oura. For details, please refer to https://cloud.ouraring.com/docs/authentication |