From 98ea11923e3d59b2b3d0ae0cd7c8487318b6f998 Mon Sep 17 00:00:00 2001 From: pvannierop Date: Mon, 21 Oct 2024 14:02:02 +0200 Subject: [PATCH] Reinstate authUrl value for rest-sources-authorizer --- charts/radar-rest-sources-authorizer/Chart.yaml | 2 +- charts/radar-rest-sources-authorizer/README.md | 3 ++- charts/radar-rest-sources-authorizer/templates/deployment.yaml | 2 +- charts/radar-rest-sources-authorizer/values.yaml | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/charts/radar-rest-sources-authorizer/Chart.yaml b/charts/radar-rest-sources-authorizer/Chart.yaml index a2971b6a..2e3af6ef 100644 --- a/charts/radar-rest-sources-authorizer/Chart.yaml +++ b/charts/radar-rest-sources-authorizer/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "4.4.4" 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: 2.0.4 +version: 2.0.5 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 fa751bc0..6ed77eaa 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: 2.0.4](https://img.shields.io/badge/Version-2.0.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.4.4](https://img.shields.io/badge/AppVersion-4.4.4-informational?style=flat-square) +![Version: 2.0.5](https://img.shields.io/badge/Version-2.0.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.4.4](https://img.shields.io/badge/AppVersion-4.4.4-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. @@ -72,3 +72,4 @@ A Helm chart for the front-end application of RADAR-base Rest Sources Authorizer | networkpolicy | object | check `values.yaml` | Network policy defines who can access this application and who this applications has access to | | clientId | string | `"radar_rest_sources_authorizer"` | OAuth2 client id of the application registered in Management Portal. It is assumed that this is a public client with empty client secret. | | serverName | string | `"localhost"` | Domain name of the server | +| authUrl | string | `nil` | Authorization URL of the IDP (overrides the default value derived from the serverName) | diff --git a/charts/radar-rest-sources-authorizer/templates/deployment.yaml b/charts/radar-rest-sources-authorizer/templates/deployment.yaml index d64af062..fcc765cd 100644 --- a/charts/radar-rest-sources-authorizer/templates/deployment.yaml +++ b/charts/radar-rest-sources-authorizer/templates/deployment.yaml @@ -61,7 +61,7 @@ spec: - name: AUTH_CALLBACK_URL value: {{ printf "%s://%s/rest-sources/authorizer/login" $https .Values.serverName }} - name: AUTH_URI - value: {{ printf "%s://%s/managementportal/oauth" $https .Values.serverName }} + value: {{ .Values.authUrl | default (printf "%s://%s/managementportal/oauth" $https .Values.serverName) }} {{- with .Values.extraEnvVars }} {{- toYaml . | nindent 10 }} {{- end }} diff --git a/charts/radar-rest-sources-authorizer/values.yaml b/charts/radar-rest-sources-authorizer/values.yaml index c3ae32e1..3e14a41c 100644 --- a/charts/radar-rest-sources-authorizer/values.yaml +++ b/charts/radar-rest-sources-authorizer/values.yaml @@ -158,3 +158,5 @@ networkpolicy: clientId: radar_rest_sources_authorizer # -- Domain name of the server serverName: localhost +# -- Authorization URL of the IDP (overrides the default value derived from the serverName) +authUrl: