From e71b3d0676843503c27c0a9e0a9b088e1a9ffdf4 Mon Sep 17 00:00:00 2001 From: Pim van Nierop Date: Tue, 28 May 2024 15:42:53 +0200 Subject: [PATCH] Improve configuration options for data-dashboard-backend --- charts/data-dashboard-backend/Chart.yaml | 2 +- charts/data-dashboard-backend/README.md | 15 ++++++++++----- .../templates/configmap.yaml | 2 +- .../templates/deployment.yaml | 4 ++-- charts/data-dashboard-backend/values.yaml | 10 ++++++---- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/charts/data-dashboard-backend/Chart.yaml b/charts/data-dashboard-backend/Chart.yaml index 41b468f6..64766d28 100644 --- a/charts/data-dashboard-backend/Chart.yaml +++ b/charts/data-dashboard-backend/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.1.0" name: data-dashboard-backend description: API for data in the data dashboard -version: 0.1.6 +version: 0.1.8 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 78830902..4384ad19 100644 --- a/charts/data-dashboard-backend/README.md +++ b/charts/data-dashboard-backend/README.md @@ -2,7 +2,9 @@ # data-dashboard-backend -![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.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square) + + +![Version: 0.1.8](https://img.shields.io/badge/Version-0.1.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square) API for data in the data dashboard @@ -26,13 +28,16 @@ API for data in the data dashboard * Kubectl 1.22+ * Helm 3.1.0+ + + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `1` | Number of replicas to deploy | -| image.repository | string | `"ghcr.io/thehyve/radar-data-dashboard-backend"` | docker image repository | +| image.repository | string | `"radarbase/radar-data-dashboard-backend"` | docker image repository | | image.pullPolicy | string | `"Always"` | image pull policy | +| image.tag | string | `"latest"` | | | imagePullSecrets | list | `[]` | Docker registry secret names as an array | | nameOverride | string | `""` | String to partially override fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override fullname template with a string | @@ -60,9 +65,9 @@ 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 | -| path | string | `"/api"` | | +| 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 | `"radarbase"` | Username of the database | -| jdbc.password | string | `"password"` | Password of the user | +| 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 | diff --git a/charts/data-dashboard-backend/templates/configmap.yaml b/charts/data-dashboard-backend/templates/configmap.yaml index 851f9484..8ad10691 100644 --- 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 index d9fa0fb4..7012d484 100644 --- 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 index b838a52c..1368bdb6 100644 --- a/charts/data-dashboard-backend/values.yaml +++ b/charts/data-dashboard-backend/values.yaml @@ -7,9 +7,11 @@ replicaCount: 1 image: # -- docker image repository - repository: ghcr.io/thehyve/radar-data-dashboard-backend + repository: radarbase/radar-data-dashboard-backend # -- image pull policy pullPolicy: Always + # Overrides the image tag whose default is the chart appVersion. + tag: latest # -- Docker registry secret names as an array imagePullSecrets: [] @@ -99,7 +101,7 @@ managementPortal: # -- ManagementPortal OAuth 2.0 client secret clientSecret: secret -# Base path to use in application +# -- Base path to use in application path: /api jdbc: @@ -108,8 +110,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