Merge branch 'main' of github.com:RADAR-base/radar-helm-charts into i…

…mage-registry

* 'main' of github.com:RADAR-base/radar-helm-charts:
  Change default path for data-dashboard-backend api

charts/data-dashboard-backend/Chart.yaml

@@ -11,9 +11,6 @@ maintainers:
   - email: [email protected]
     name: Keyvan Hedayati
     url: https://www.thehyve.nl
-  - email: [email protected]
-    name: Nivethika Mahasivam
-    url: https://www.thehyve.nl/experts/nivethika-mahasivam
   - email: [email protected]
     name: Pim van Nierop
     url: https://www.thehyve.nl/experts/pim-van-nierop

charts/data-dashboard-backend/README.md

@@ -13,7 +13,6 @@ API for data in the data dashboard
 | Name | Email | Url |
 | ---- | ------ | --- |
 | Keyvan Hedayati | <[email protected]> | <https://www.thehyve.nl> |
-| Nivethika Mahasivam | <[email protected]> | <https://www.thehyve.nl/experts/nivethika-mahasivam> |
 | Pim van Nierop | <[email protected]> | <https://www.thehyve.nl/experts/pim-van-nierop> |
 
 ## Source Code
@@ -52,7 +51,7 @@ API for data in the data dashboard
 | ingress.enabled | bool | `true` | Enable ingress controller resource |
 | ingress.ingressClassName | string | `"nginx"` | Ingress class name |
 | ingress.annotations | object | check values.yaml | Annotations that define default ingress class, certificate issuer |
-| ingress.path | string | `"/api"` | Path within the url structure |
+| ingress.path | string | `"/dashboard-data"` | Path within the url structure |
 | ingress.pathType | string | `"ImplementationSpecific"` |  |
 | ingress.hosts | list | `["localhost"]` | Hosts to accept requests from |
 | ingress.tls.secretName | string | `"radar-base-tls"` |  |
@@ -71,7 +70,6 @@ API for data in the data dashboard
 | 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 |

charts/data-dashboard-backend/templates/configmap.yaml

@@ -10,7 +10,7 @@ metadata:
 data:
   dashboard.yml: |
     service:
-      baseUri: http://0.0.0.0:9000{{ .Values.path }}
+      baseUri: http://0.0.0.0:9000{{ .Values.ingress.path }}
       advertisedBaseUri: null
       enableCors: true
     auth:

charts/data-dashboard-backend/values.yaml

@@ -62,7 +62,7 @@ ingress:
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod
   # -- Path within the url structure
-  path: /api
+  path: /dashboard-data
   pathType: ImplementationSpecific
   # -- Hosts to accept requests from
   hosts:
@@ -157,9 +157,6 @@ managementPortal:
 # -- JWT Resource name to use for this service in ManagementPortal
 jwtResourceName: res_DataDashboardAPI
 
-# -- Base path to use in application
-path: /api
-
 jdbc:
   # -- JDBC Driver to connect to the database.
   driver: org.postgresql.Driver