Fix passing config to data-dashboard-backend

RADAR-base · May 28, 2024 · 7fe7639 · 7fe7639
1 parent e4d7bdc
commit 7fe7639
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/charts/data-dashboard-backend/templates/configmap.yaml b/charts/data-dashboard-backend/templates/configmap.yaml
@@ -18,7 +18,7 @@ data:
         url: {{ .Values.managementPortal.url }}
         clientId: {{ .Values.managementPortal.clientId }}
         clientSecret: {{ .Values.managementPortal.clientSecret }}
-      jwtResourceName: res_data_dashboard_backend
+      jwtResourceName: {{ .Values.jwtResourceName }}
     database:
       url: {{ .Values.jdbc.url }}
       user: {{ .Values.jdbc.user }}

diff --git a/charts/data-dashboard-backend/templates/deployment.yaml b/charts/data-dashboard-backend/templates/deployment.yaml
@@ -58,14 +58,14 @@ spec:
               protocol: TCP
           livenessProbe:
             httpGet:
-              path: /api/health
+              path: {{ .Values.path }}/health
               port: http
               httpHeaders:
                 - name: Accept
                   value: application/json
           readinessProbe:
             httpGet:
-              path: /api/health
+              path: {{ .Values.path }}/health
               port: http
               httpHeaders:
                 - name: Accept

diff --git a/charts/data-dashboard-backend/values.yaml b/charts/data-dashboard-backend/values.yaml
@@ -111,8 +111,8 @@ jdbc:
   # -- JDBC Connection url of the database.
   url: jdbc:postgresql://postgresql:5432/data-dashboard
   # -- Username of the database
-  user: radarbase
+  user: postgres
   # -- Password of the user
-  password: password
+  password: secret
   # -- Hibernate dialect to use for JDBC Connection
   dialect: org.hibernate.dialect.PostgreSQLDialect
diff --git a/etc/data-dashboard-backend/values.yaml b/etc/data-dashboard-backend/values.yaml
@@ -10,6 +10,14 @@ ingress:
     secretName: radar-base-data-dashboard
     hosts:
       - localhost
+path: /api
 jdbc:
   url: jdbc:postgresql://timescaledb-postgresql-hl:5432/data-dashboard
-  user: radarbase
+  user: postgres
+  dialect: org.hibernate.dialect.PostgreSQLDialect
+  password: secret
+managementPortal:
+  url: http://management-portal:8080/managementportal
+  clientId: radar_data_dashboard_backend
+  clientSecret: secret
+jwtResourceName: res_DataDashboardAPI
diff --git a/helmfile.d/20-dashboard.yaml b/helmfile.d/20-dashboard.yaml
@@ -84,6 +84,8 @@ releases:
         value: {{ .Values.timescaledb_password }}
       - name: jdbc.url
         value: {{ dig "jdbc" "url" (printf "jdbc:postgresql://timescaledb-postgresql-hl:5432/%s" .Values.timescaledb_db_name) .Values.data_dashboard_backend }}
+      - name: managementPortal.clientSecret
+        value: {{ .Values.management_portal.oauth_clients.radar_data_dashboard_backend.client_secret }}
 
   - name: kafka-data-transformer
     chart: cp-radar/cp-ksql-server