From 93cdb4ac7032e822172bfdcf32c48922f8765c3c Mon Sep 17 00:00:00 2001 From: Pim van Nierop Date: Thu, 6 Jun 2024 11:45:55 +0200 Subject: [PATCH 1/6] Rename tls secret --- charts/data-dashboard-backend/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/data-dashboard-backend/values.yaml b/charts/data-dashboard-backend/values.yaml index 9f20b401..0bcf08bb 100644 --- a/charts/data-dashboard-backend/values.yaml +++ b/charts/data-dashboard-backend/values.yaml @@ -56,7 +56,7 @@ ingress: hosts: - localhost tls: - secretName: radar-base-data-dashboard + secretName: radar-base-data-dashboard-tls resources: {} # We usually recommend not to specify default resources and to leave this as a conscious From a2249ef9df20259b91bea9e7caac2b79ae4fc9b4 Mon Sep 17 00:00:00 2001 From: Pim van Nierop Date: Thu, 6 Jun 2024 14:12:05 +0200 Subject: [PATCH 2/6] Add jdbc properties to chart --- charts/data-dashboard-backend/templates/configmap.yaml | 2 ++ charts/data-dashboard-backend/values.yaml | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/charts/data-dashboard-backend/templates/configmap.yaml b/charts/data-dashboard-backend/templates/configmap.yaml index 8ad10691..5e691d19 100644 --- a/charts/data-dashboard-backend/templates/configmap.yaml +++ b/charts/data-dashboard-backend/templates/configmap.yaml @@ -24,3 +24,5 @@ data: user: {{ .Values.jdbc.user }} password: {{ .Values.jdbc.password }} dialect: {{ .Values.jdbc.dialect }} + properties: + {{ .Values.jdbc.properties | toYaml | indent 8 | trim }} diff --git a/charts/data-dashboard-backend/values.yaml b/charts/data-dashboard-backend/values.yaml index 0bcf08bb..a1499025 100644 --- a/charts/data-dashboard-backend/values.yaml +++ b/charts/data-dashboard-backend/values.yaml @@ -115,3 +115,8 @@ jdbc: password: secret # -- Hibernate dialect to use for JDBC Connection dialect: org.hibernate.dialect.PostgreSQLDialect + properties: + # -- Must be _true_ for compatibility with table created by jdbc-connector + hibernate.globally_quoted_identifiers: true + # -- Must be _CamelCaseToUppercaseColumnNamingStrategy_ for compatibility with table created by jdbc-connector + hibernate.physical_naming_strategy: org.radarbase.datadashboard.api.domain.model.CamelCaseToUppercaseColumnNamingStrategy From 1c2dd44fa247e0a61c985077c50c6a38c4c92b07 Mon Sep 17 00:00:00 2001 From: Pim van Nierop Date: Thu, 6 Jun 2024 14:14:54 +0200 Subject: [PATCH 3/6] Fix MP oauth client config --- charts/management-portal/values.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/charts/management-portal/values.yaml b/charts/management-portal/values.yaml index 9851ae82..3a38a557 100644 --- a/charts/management-portal/values.yaml +++ b/charts/management-portal/values.yaml @@ -342,8 +342,10 @@ oauth_clients: - res_ManagementPortal - res_appconfig - res_AppServer + - res_DataDashboardAPI client_secret: "" scope: + - MEASUREMENT.READ - MEASUREMENT.CREATE - PROJECT.READ - ROLE.READ @@ -572,10 +574,14 @@ oauth_clients: enable: false resource_ids: - res_DataDashboardAPI + - res_ManagementPortal client_secret: "" scope: + - PROJECT.READ + - SUBJECT.READ - MEASUREMENT.READ authorized_grant_types: - authorization_code - refresh_token + - client_credentials access_token_validity: 900 From d4c2ff1f4fe9f9dd3f84f71d6929d319d2a3a5b5 Mon Sep 17 00:00:00 2001 From: Pim van Nierop Date: Fri, 14 Jun 2024 14:02:22 +0200 Subject: [PATCH 4/6] Add jwtResourceName default value --- charts/data-dashboard-backend/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/data-dashboard-backend/values.yaml b/charts/data-dashboard-backend/values.yaml index a1499025..ca19a1ec 100644 --- a/charts/data-dashboard-backend/values.yaml +++ b/charts/data-dashboard-backend/values.yaml @@ -100,6 +100,8 @@ managementPortal: clientId: radar_data_dashboard_backend # -- ManagementPortal OAuth 2.0 client secret clientSecret: secret +# -- JWT Resource name to use for this service in ManagementPortal +jwtResourceName: res_DataDashboardAPI # -- Base path to use in application path: /api From e6338ef850a28c8a26dc7476ff78a29f566e7d18 Mon Sep 17 00:00:00 2001 From: Pim van Nierop Date: Fri, 21 Jun 2024 09:03:46 +0200 Subject: [PATCH 5/6] Up chart version --- charts/data-dashboard-backend/Chart.yaml | 2 +- charts/data-dashboard-backend/README.md | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/charts/data-dashboard-backend/Chart.yaml b/charts/data-dashboard-backend/Chart.yaml index 3a57fe31..6f8f900d 100644 --- a/charts/data-dashboard-backend/Chart.yaml +++ b/charts/data-dashboard-backend/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.1.2" name: data-dashboard-backend description: API for data in the data dashboard -version: 0.1.9 +version: 0.2.0 sources: ["https://github.com/thehyve/radar-data-dashboard-backend"] deprecated: false type: application diff --git a/charts/data-dashboard-backend/README.md b/charts/data-dashboard-backend/README.md index 641a81ad..5c59e1e1 100644 --- a/charts/data-dashboard-backend/README.md +++ b/charts/data-dashboard-backend/README.md @@ -2,7 +2,7 @@ # data-dashboard-backend -![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: 0.1.2](https://img.shields.io/badge/AppVersion-0.1.2-informational?style=flat-square) +![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.2](https://img.shields.io/badge/AppVersion-0.1.2-informational?style=flat-square) API for data in the data dashboard @@ -47,7 +47,7 @@ API for data in the data dashboard | ingress.path | string | `"/api"` | Path within the url structure | | ingress.pathType | string | `"ImplementationSpecific"` | | | ingress.hosts | list | `["localhost"]` | Hosts to accept requests from | -| ingress.tls.secretName | string | `"radar-base-data-dashboard"` | | +| ingress.tls.secretName | string | `"radar-base-data-dashboard-tls"` | | | resources | object | `{}` | | | autoscaling.enabled | bool | `false` | Enable horizontal autoscaling | | autoscaling.minReplicas | int | `1` | | @@ -61,9 +61,12 @@ API for data in the data dashboard | managementPortal.url | string | `"http://management-portal:8080/managementportal"` | ManagementPortal URL | | managementPortal.clientId | string | `"radar_data_dashboard_backend"` | ManagementPortal OAuth 2.0 client ID, having grant type client_credentials | | managementPortal.clientSecret | string | `"secret"` | ManagementPortal OAuth 2.0 client secret | +| jwtResourceName | string | `"res_DataDashboardAPI"` | JWT Resource name to use for this service in ManagementPortal | | path | string | `"/api"` | Base path to use in application | | jdbc.driver | string | `"org.postgresql.Driver"` | JDBC Driver to connect to the database. | | jdbc.url | string | `"jdbc:postgresql://postgresql:5432/data-dashboard"` | JDBC Connection url of the database. | | jdbc.user | string | `"postgres"` | Username of the database | | jdbc.password | string | `"secret"` | Password of the user | | jdbc.dialect | string | `"org.hibernate.dialect.PostgreSQLDialect"` | Hibernate dialect to use for JDBC Connection | +| jdbc.properties."hibernate.globally_quoted_identifiers" | bool | `true` | Must be _true_ for compatibility with table created by jdbc-connector | +| jdbc.properties."hibernate.physical_naming_strategy" | string | `"org.radarbase.datadashboard.api.domain.model.CamelCaseToUppercaseColumnNamingStrategy"` | Must be _CamelCaseToUppercaseColumnNamingStrategy_ for compatibility with table created by jdbc-connector | From 7837fec8d35e1721659081be9824882b1e649bbc Mon Sep 17 00:00:00 2001 From: Pim van Nierop Date: Fri, 21 Jun 2024 09:14:08 +0200 Subject: [PATCH 6/6] Up MP chart version --- charts/management-portal/Chart.yaml | 2 +- charts/management-portal/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/management-portal/Chart.yaml b/charts/management-portal/Chart.yaml index 95bbce06..88591538 100644 --- a/charts/management-portal/Chart.yaml +++ b/charts/management-portal/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "2.0.0" description: A Helm chart for RADAR-Base Management Portal to manage projects and participants throughout RADAR-base. name: management-portal -version: 1.1.6 +version: 1.1.7 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/management-portal diff --git a/charts/management-portal/README.md b/charts/management-portal/README.md index c971f5d8..ceb7c458 100644 --- a/charts/management-portal/README.md +++ b/charts/management-portal/README.md @@ -3,7 +3,7 @@ # management-portal [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/management-portal)](https://artifacthub.io/packages/helm/radar-base/management-portal) -![Version: 1.1.6](https://img.shields.io/badge/Version-1.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square) +![Version: 1.1.7](https://img.shields.io/badge/Version-1.1.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square) A Helm chart for RADAR-Base Management Portal to manage projects and participants throughout RADAR-base.