Merge pull request #98 from RADAR-base/mp-url

More flexible MP URL
RADAR-base · Oct 3, 2023 · 0881c3c · 0881c3c
2 parents 4bc3be5 + 6af46c2
commit 0881c3c
Show file tree

Hide file tree

Showing 39 changed files with 67 additions and 66 deletions.
diff --git a/charts/app-config/Chart.yaml b/charts/app-config/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "0.5.0"
 description: A Helm chart for RADAR-base application config (app-config) backend service which is used as mobile app configuration engine with per-project and per-user configuration.
 name: app-config
-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/app-config

diff --git a/charts/app-config/README.md b/charts/app-config/README.md
@@ -3,7 +3,7 @@
 # app-config
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/app-config)](https://artifacthub.io/packages/helm/radar-base/app-config)
 
-![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: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.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: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.0-informational?style=flat-square)
 
 A Helm chart for RADAR-base application config (app-config) backend service which is used as mobile app configuration engine with per-project and per-user configuration.
 
@@ -36,8 +36,8 @@ A Helm chart for RADAR-base application config (app-config) backend service whic
 | image.tag | string | `"0.5.0"` | Appconfig image tag (immutable tags are recommended) |
 | image.pullPolicy | string | `"IfNotPresent"` | Appconfig image pull policy |
 | imagePullSecrets | list | `[]` | Docker registry secret names as an array |
-| nameOverride | string | `""` | String to partially override management-portal.fullname template with a string (will prepend the release name) |
-| fullnameOverride | string | `""` | String to fully override management-portal.fullname template with a string |
+| nameOverride | string | `""` | String to partially override appconfig.fullname template with a string (will prepend the release name) |
+| fullnameOverride | string | `""` | String to fully override appconfig.fullname template with a string |
 | namespace | string | `"default"` | Kubernetes namespace that Appconfig is going to be deployed on |
 | serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
 | serviceAccount.name | string | `nil` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
@@ -75,6 +75,7 @@ A Helm chart for RADAR-base application config (app-config) backend service whic
 | javaOpts | string | `"-Xmx550m"` | Standard JAVA_OPTS that should be passed to this service |
 | clientId | string | `"radar_appconfig"` | OAuth2 client id |
 | clientSecret | string | `"secret"` | OAuth2 client secret |
+| managementportal_url | string | `"http://management-portal:8080/managementportal"` | URL of the Management Portal |
 | jdbc.driver | string | `"org.postgresql.Driver"` | JDBC Driver to connect to the database. |
 | jdbc.url | string | `"jdbc:postgresql://postgresql:5432/appconfig"` | JDBC Connection url of the database. |
 | jdbc.user | string | `"postgres"` | Username of the database |

diff --git a/charts/app-config/templates/configmap.yaml b/charts/app-config/templates/configmap.yaml
@@ -23,7 +23,7 @@ data:
 
     auth:
       managementPortal:
-        url: http://management-portal:8080/managementportal
+        url: {{ .Values.managementportal_url }}
       jwtResourceName: res_appconfig
 
     database:

diff --git a/charts/app-config/values.yaml b/charts/app-config/values.yaml
@@ -16,9 +16,9 @@ image:
 # -- Docker registry secret names as an array
 imagePullSecrets: []
 
-# -- String to partially override management-portal.fullname template with a string (will prepend the release name)
+# -- String to partially override appconfig.fullname template with a string (will prepend the release name)
 nameOverride: ""
-# -- String to fully override management-portal.fullname template with a string
+# -- String to fully override appconfig.fullname template with a string
 fullnameOverride: ""
 
 # -- Kubernetes namespace that Appconfig is going to be deployed on
@@ -139,6 +139,9 @@ clientId: radar_appconfig
 # -- OAuth2 client secret
 clientSecret: secret
 
+# -- URL of the Management Portal
+managementportal_url: http://management-portal:8080/managementportal
+
 jdbc:
   # -- JDBC Driver to connect to the database.
   driver: org.postgresql.Driver

diff --git a/charts/radar-appserver/Chart.yaml b/charts/radar-appserver/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "2.3.0"
 description: A Helm chart for the backend application of RADAR-base Appserver
 name: radar-appserver
-version: 0.1.9
+version: 0.1.10
 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-appserver

diff --git a/charts/radar-appserver/README.md b/charts/radar-appserver/README.md
@@ -3,7 +3,7 @@
 # radar-appserver
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-appserver)](https://artifacthub.io/packages/helm/radar-base/radar-appserver)
 
-![Version: 0.1.9](https://img.shields.io/badge/Version-0.1.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square)
+![Version: 0.1.10](https://img.shields.io/badge/Version-0.1.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square)
 
 A Helm chart for the backend application of RADAR-base Appserver
 
@@ -77,7 +77,7 @@ A Helm chart for the backend application of RADAR-base Appserver
 | postgres.ssl.keystorepassword | string | `"keystorepassword"` |  |
 | radar_admin_user | string | `"radar"` |  |
 | radar_admin_password | string | `"radar"` |  |
-| managementportal_host | string | `"management-portal"` | hostname of the Management Portal |
+| managementportal_url | string | `"http://management-portal:8080/managementportal"` | URL of the Management Portal |
 | serverName | string | `"localhost"` |  |
 | managementportal_resource_name | string | `"res_AppServer"` | radar_is.yml config for token verification |
 | public_key_endpoints | string | `nil` |  |

diff --git a/charts/radar-appserver/templates/deployment.yaml b/charts/radar-appserver/templates/deployment.yaml
@@ -66,7 +66,7 @@ spec:
                 name: {{ template "radar-appserver.secretName" . }}
                 key: databasePassword
           - name: SECURITY_RADAR_MANAGEMENTPORTAL_URL
-            value: "http://{{ .Values.managementportal_host }}/managementportal"
+            value: "{{ .Values.managementportal_url }}"
           - name: GOOGLE_APPLICATION_CREDENTIALS
             value: /etc/google/firebase-adminsdk.json
           - name: RADAR_ADMIN_USER

diff --git a/charts/radar-appserver/values.yaml b/charts/radar-appserver/values.yaml
@@ -146,8 +146,8 @@ postgres:
 radar_admin_user: radar
 radar_admin_password: radar
 
-# -- hostname of the Management Portal
-managementportal_host: management-portal
+# -- URL of the Management Portal
+managementportal_url: http://management-portal:8080/managementportal
 
 serverName: localhost
 

diff --git a/charts/radar-fitbit-connector/Chart.yaml b/charts/radar-fitbit-connector/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "0.4.1"
 description: A Helm chart for RADAR-base fitbit connector. This application collects data from participants via the Fitbit Web API.
 name: radar-fitbit-connector
-version: 0.2.7
+version: 0.2.8
 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-fitbit-connector

diff --git a/charts/radar-fitbit-connector/README.md b/charts/radar-fitbit-connector/README.md
@@ -3,7 +3,7 @@
 # radar-fitbit-connector
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-fitbit-connector)](https://artifacthub.io/packages/helm/radar-base/radar-fitbit-connector)
 
-![Version: 0.2.7](https://img.shields.io/badge/Version-0.2.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.1](https://img.shields.io/badge/AppVersion-0.4.1-informational?style=flat-square)
+![Version: 0.2.8](https://img.shields.io/badge/Version-0.2.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.1](https://img.shields.io/badge/AppVersion-0.4.1-informational?style=flat-square)
 
 A Helm chart for RADAR-base fitbit connector. This application collects data from participants via the Fitbit Web API.
 
@@ -79,5 +79,5 @@ A Helm chart for RADAR-base fitbit connector. This application collects data fro
 | fitbit_api_secret | string | `""` | Fitbit API client secret. |
 | oauthClientId | string | `"radar_fitbit_connector"` | OAuth2 client id from Management Portal |
 | oauthClientSecret | string | `"secret"` | OAuth2 client secret from Management Portal |
-| managementportal_host | string | `"management-portal"` | Hostname of Management Portal. This will be used to create URLs to access Management Portal |
+| managementportal_url | string | `"http://management-portal:8080/managementportal"` | URL of Management Portal. This will be used to create URLs to access Management Portal |
 | includeIntradayData | bool | `true` | Set to true, if intraday access data should be collected by the connector. This will be set in connector.properties. |
diff --git a/charts/radar-fitbit-connector/templates/configmap-properties.yaml b/charts/radar-fitbit-connector/templates/configmap-properties.yaml
@@ -22,7 +22,7 @@ data:
     fitbit.user.repository.url={{ .Values.radar_rest_sources_backend_url }}
     fitbit.user.repository.client.id={{ .Values.oauthClientId }}
     fitbit.user.repository.client.secret={{ .Values.oauthClientSecret }}
-    fitbit.user.repository.oauth2.token.url=http://{{ .Values.managementportal_host }}:8080/managementportal/oauth/token
+    fitbit.user.repository.oauth2.token.url={{ .Values.managementportal_url }}/oauth/token
   {{- if and .Values.kafka_wait.enabled .Values.kafka_wait.properties }}
   kafka-wait.properties: |
     {{ .Values.kafka_wait.properties | indent 4 }}

diff --git a/charts/radar-fitbit-connector/values.yaml b/charts/radar-fitbit-connector/values.yaml
@@ -155,7 +155,7 @@ fitbit_api_secret: ""
 oauthClientId: radar_fitbit_connector
 # -- OAuth2 client secret from Management Portal
 oauthClientSecret: secret
-# -- Hostname of Management Portal. This will be used to create URLs to access Management Portal
-managementportal_host: management-portal
+# -- URL of Management Portal. This will be used to create URLs to access Management Portal
+managementportal_url: http://management-portal:8080/managementportal
 # -- Set to true, if intraday access data should be collected by the connector. This will be set in connector.properties.
 includeIntradayData: true
diff --git a/charts/radar-gateway/Chart.yaml b/charts/radar-gateway/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "0.6.0"
 description: A Helm chart for RADAR-base gateway. REST Gateway to Kafka, for incoming participant data. It performs authentication, authorization, content validation and decompression. For more details of the configurations, see https://github.com/RADAR-base/RADAR-Gateway/blob/master/gateway.yml.
 name: radar-gateway
-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-gateway

diff --git a/charts/radar-gateway/README.md b/charts/radar-gateway/README.md
@@ -3,7 +3,7 @@
 # radar-gateway
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-gateway)](https://artifacthub.io/packages/helm/radar-base/radar-gateway)
 
-![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: 0.6.0](https://img.shields.io/badge/AppVersion-0.6.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: 0.6.0](https://img.shields.io/badge/AppVersion-0.6.0-informational?style=flat-square)
 
 A Helm chart for RADAR-base gateway. REST Gateway to Kafka, for incoming participant data. It performs authentication, authorization, content validation and decompression. For more details of the configurations, see https://github.com/RADAR-base/RADAR-Gateway/blob/master/gateway.yml.
 
@@ -69,7 +69,7 @@ A Helm chart for RADAR-base gateway. REST Gateway to Kafka, for incoming partici
 | readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe |
 | readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe |
 | serviceMonitor.enabled | bool | `true` | Enable metrics to be collected via Prometheus-operator |
-| managementportalHost | string | `"management-portal"` | Host name of the management portal application |
+| managementportal_url | string | `"http://management-portal:8080/managementportal"` | URL of the management portal application |
 | schemaRegistry | string | `"http://cp-schema-registry:8081"` | Schema Registry URL |
 | max_requests | int | `1000` | Not used. To be confirmed |
 | bootstrapServers | string | `"cp-kafka-headless:9092"` | Kafka broker URLs |

diff --git a/charts/radar-gateway/templates/configmap.yaml b/charts/radar-gateway/templates/configmap.yaml
@@ -9,11 +9,11 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
   healthcheck.sh: |
-     #!/bin/sh
-     STATUS=$(curl -s --max-time 4 localhost:{{ .Values.service.port }}/kafka/health)
-     if ! (echo "$STATUS" | grep -Fq '"kafka":{"status":"UP"'); then
-       exit 1
-     fi
+    #!/bin/sh
+    STATUS=$(curl -s --max-time 4 localhost:{{ .Values.service.port }}/kafka/health)
+    if ! (echo "$STATUS" | grep -Fq '"kafka":{"status":"UP"'); then
+      exit 1
+    fi
   gateway.yml: |
     # Resource config class
     #resourceConfig: org.radarbase.gateway.inject.ManagementPortalEnhancerFactory
@@ -57,5 +57,5 @@ data:
         schema.registry.basic.auth.user.info: {{ .Values.cc.schemaRegistryApiKey }}:{{ .Values.cc.schemaRegistryApiSecret }}
         {{- end }}
     auth:
-      managementPortalUrl: http://{{ .Values.managementportalHost }}:8080/managementportal
+      managementPortalUrl: {{ .Values.managementportal_url }}
       checkSourceId: {{ .Values.checkSourceId }}
diff --git a/charts/radar-gateway/values.yaml b/charts/radar-gateway/values.yaml
@@ -134,8 +134,8 @@ serviceMonitor:
   # -- Enable metrics to be collected via Prometheus-operator
   enabled: true
 
-# -- Host name of the management portal application
-managementportalHost: management-portal
+# -- URL of the management portal application
+managementportal_url: http://management-portal:8080/managementportal
 # -- Schema Registry URL
 schemaRegistry: http://cp-schema-registry:8081
 # -- Not used. To be confirmed

diff --git a/charts/radar-home/Chart.yaml b/charts/radar-home/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "0.1.3"
 description: RADAR-base home page.
 name: radar-home
-version: 0.1.5
+version: 0.1.6
 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-home

diff --git a/charts/radar-home/README.md b/charts/radar-home/README.md
@@ -3,7 +3,7 @@
 # radar-home
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-home)](https://artifacthub.io/packages/helm/radar-base/radar-home)
 
-![Version: 0.1.5](https://img.shields.io/badge/Version-0.1.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.3](https://img.shields.io/badge/AppVersion-0.1.3-informational?style=flat-square)
+![Version: 0.1.6](https://img.shields.io/badge/Version-0.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.3](https://img.shields.io/badge/AppVersion-0.1.3-informational?style=flat-square)
 
 RADAR-base home page.
 
@@ -35,8 +35,8 @@ RADAR-base home page.
 | image.tag | string | `"0.1.3"` | Appconfig image tag (immutable tags are recommended) |
 | image.pullPolicy | string | `"IfNotPresent"` | Appconfig image pull policy |
 | imagePullSecrets | list | `[]` | Docker registry secret names as an array |
-| nameOverride | string | `""` | String to partially override management-portal.fullname template with a string (will prepend the release name) |
-| fullnameOverride | string | `""` | String to fully override management-portal.fullname template with a string |
+| nameOverride | string | `""` | String to partially override radar-home.fullname template with a string (will prepend the release name) |
+| fullnameOverride | string | `""` | String to fully override radar-home.fullname template with a string |
 | namespace | string | `"default"` | Kubernetes namespace that Appconfig is going to be deployed on |
 | service.type | string | `"ClusterIP"` | Kubernetes Service type |
 | service.port | int | `8080` | Port |

diff --git a/charts/radar-home/values.yaml b/charts/radar-home/values.yaml
@@ -16,9 +16,9 @@ image:
 # -- Docker registry secret names as an array
 imagePullSecrets: []
 
-# -- String to partially override management-portal.fullname template with a string (will prepend the release name)
+# -- String to partially override radar-home.fullname template with a string (will prepend the release name)
 nameOverride: ""
-# -- String to fully override management-portal.fullname template with a string
+# -- String to fully override radar-home.fullname template with a string
 fullnameOverride: ""
 
 # -- Kubernetes namespace that Appconfig is going to be deployed on

diff --git a/charts/radar-integration/Chart.yaml b/charts/radar-integration/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "1.0.4"
 description: A Helm chart for RADAR-Base REDCap survey integration application.
 name: radar-integration
-version: 0.4.3
+version: 0.4.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-integration

diff --git a/charts/radar-integration/README.md b/charts/radar-integration/README.md
@@ -3,7 +3,7 @@
 # radar-integration
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-integration)](https://artifacthub.io/packages/helm/radar-base/radar-integration)
 
-![Version: 0.4.3](https://img.shields.io/badge/Version-0.4.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.4](https://img.shields.io/badge/AppVersion-1.0.4-informational?style=flat-square)
+![Version: 0.4.4](https://img.shields.io/badge/Version-0.4.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.4](https://img.shields.io/badge/AppVersion-1.0.4-informational?style=flat-square)
 
 A Helm chart for RADAR-Base REDCap survey integration application.
 
@@ -68,7 +68,7 @@ A Helm chart for RADAR-Base REDCap survey integration application.
 | readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe |
 | oauth_client_id | string | `"radar_redcap_integrator"` | OAuth2 clientId used by the webApp for making requests |
 | oauth_client_secret | string | `"secret"` | OAuth2 client secret |
-| management_portal_url | string | `"management-portal"` | Base URL of the Management Portal |
+| managementportal_url | string | `"http://management-portal:8080/managementportal"` | URL of the Management Portal |
 | projects[0].redcap_info.url | string | `""` | URL pointing REDCap instance |
 | projects[0].redcap_info.project_id | string | `""` | REDCap project identifier |
 | projects[0].redcap_info.api_path | string | `"/api/"` | Redcap relative api path |

diff --git a/charts/radar-integration/templates/configmap.yaml b/charts/radar-integration/templates/configmap.yaml
@@ -13,7 +13,7 @@ data:
     management_portal:
       oauth_client_id: {{ .Values.oauth_client_id }} #OAuth2 clientId used by the webApp for making requests
       oauth_client_secret: {{ .Values.oauth_client_secret }} #OAuth2 client secret
-      base_url: http://{{ .Values.management_portal_url }}:8080/managementportal/ #Base URL of the Management Portal
+      base_url: {{ .Values.managementportal_url }} #Base URL of the Management Portal
 
     # Set of supported projects
     projects:

diff --git a/charts/radar-integration/values.yaml b/charts/radar-integration/values.yaml
@@ -124,8 +124,8 @@ readinessProbe:
 oauth_client_id: radar_redcap_integrator
 # -- OAuth2 client secret
 oauth_client_secret: secret
-# -- Base URL of the Management Portal
-management_portal_url: management-portal
+# -- URL of the Management Portal
+managementportal_url: http://management-portal:8080/managementportal
 
 projects:
   - redcap_info: