Correct properties in chart for data-dashboard

RADAR-base · Apr 9, 2024 · 3aca255 · 3aca255
1 parent f690d8f
commit 3aca255
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 51 deletions.
diff --git 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.2
+version: 0.1.5
 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
@@ -25,43 +25,43 @@ API for data in the data dashboard
 
 ## Values
 
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| replicaCount | int | `2` | Number of replicas to deploy |
-| image.repository | string | `"quay.io/imi-h2o/data-dashboard-backend"` | docker image repository |
-| image.pullPolicy | string | `"Always"` | image pull policy |
-| image.tag | string | `"dev"` |  |
-| 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 |
-| podSecurityContext | object | `{}` | Configure pod's Security Context |
-| securityContext | object | `{}` | Configure container's Security Context |
-| service.type | string | `"ClusterIP"` | Kubernetes Service type |
-| service.port | int | `8080` | data-dashboard-backend port |
-| ingress.enabled | bool | `true` | Enable ingress controller resource |
-| ingress.className | string | `""` | 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.pathType | string | `"ImplementationSpecific"` |  |
-| ingress.hosts | list | `["localhost"]` | Hosts to accept requests from |
-| ingress.tls.secretName | string | `"radar-base-tls"` | TLS Secret Name |
-| resources | object | `{}` |  |
-| autoscaling.enabled | bool | `false` | Enable horizontal autoscaling |
-| autoscaling.minReplicas | int | `1` |  |
-| autoscaling.maxReplicas | int | `100` |  |
-| autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
-| nodeSelector | object | `{}` | Node labels for pod assignment |
-| tolerations | list | `[]` | Toleration labels for pod assignment |
-| affinity | object | `{}` | Affinity labels for pod assignment |
-| existingSecret | string | `""` |  |
-| javaOpts | string | `"-Xmx550m"` | Standard JAVA_OPTS that should be passed to this service |
+| Key | Type | Default                                            | Description |
+|-----|------|----------------------------------------------------|-------------|
+| replicaCount | int | `2`                                                | Number of replicas to deploy |
+| image.repository | string | `"quay.io/imi-h2o/data-dashboard-backend"`         | docker image repository |
+| image.pullPolicy | string | `"Always"`                                         | image pull policy |
+| image.tag | string | `"dev"`                                            |  |
+| 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 |
+| podSecurityContext | object | `{}`                                               | Configure pod's Security Context |
+| securityContext | object | `{}`                                               | Configure container's Security Context |
+| service.type | string | `"ClusterIP"`                                      | Kubernetes Service type |
+| service.port | int | `9000`                                             | data-dashboard-backend port |
+| ingress.enabled | bool | `true`                                             | Enable ingress controller resource |
+| ingress.className | string | `""`                                               | 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.pathType | string | `"ImplementationSpecific"`                         |  |
+| ingress.hosts | list | `["localhost"]`                                    | Hosts to accept requests from |
+| ingress.tls.secretName | string | `"radar-base-tls"`                                 | TLS Secret Name |
+| resources | object | `{}`                                               |  |
+| autoscaling.enabled | bool | `false`                                            | Enable horizontal autoscaling |
+| autoscaling.minReplicas | int | `1`                                                |  |
+| autoscaling.maxReplicas | int | `100`                                              |  |
+| autoscaling.targetCPUUtilizationPercentage | int | `80`                                               |  |
+| nodeSelector | object | `{}`                                               | Node labels for pod assignment |
+| tolerations | list | `[]`                                               | Toleration labels for pod assignment |
+| affinity | object | `{}`                                               | Affinity labels for pod assignment |
+| existingSecret | string | `""`                                               |  |
+| javaOpts | string | `"-Xmx550m"`                                       | Standard JAVA_OPTS that should be passed to this service |
 | managementPortal.url | string | `"http://management-portal:8080/managementportal"` | ManagementPortal URL |
-| managementPortal.clientId | string | `"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"` |  |
-| score | object | Diabetes score calculation table configurations | Where to find lookup tables for score calculations, and how to calculate them. |
-| jdbc.driver | string | `"org.postgresql.Driver"` | JDBC Driver to connect to the database. |
-| jdbc.url | string | `"jdbc:postgresql://postgresql:5432/outcomes"` | JDBC Connection url of the database. |
-| jdbc.user | string | `"radarbase"` | Username of the database |
-| jdbc.password | string | `"password"` | Password of the user |
-| jdbc.dialect | string | `"org.hibernate.dialect.PostgreSQLDialect"` | Hibernate dialect to use for JDBC Connection |
+| managementPortal.clientId | string | `"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"`                                           |  |
+| score | object | Diabetes score calculation table configurations    | Where to find lookup tables for score calculations, and how to calculate them. |
+| jdbc.driver | string | `"org.postgresql.Driver"`                          | JDBC Driver to connect to the database. |
+| jdbc.url | string | `"jdbc:postgresql://postgresql:5432/outcomes"`     | JDBC Connection url of the database. |
+| jdbc.user | string | `"radarbase"`                                      | Username of the database |
+| jdbc.password | string | `"password"`                                       | 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/NOTES.txt b/charts/data-dashboard-backend/templates/NOTES.txt
@@ -15,6 +15,6 @@
 {{- else if contains "ClusterIP" .Values.service.type }}
   export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "data-dashboard-backend.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+  echo "Visit http://127.0.0.1:9000 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 9000:$CONTAINER_PORT
 {{- end }}
diff --git a/charts/data-dashboard-backend/templates/configmap.yaml b/charts/data-dashboard-backend/templates/configmap.yaml
@@ -15,10 +15,10 @@ data:
       enableCors: true
     auth:
       managementPortal:
-        url: {{ .Values.managementportal.url }}
-        clientId: {{ .Values.managementportal.clientId }}
-        clientSecret: {{ .Values.managementportal.clientSecret }}
-      jwtResourceName: {{ .Values.managementportal.rsesourceName }}
+        url: {{ .Values.managementPortal.url }}
+        clientId: {{ .Values.managementPortal.clientId }}
+        clientSecret: {{ .Values.managementPortal.clientSecret }}
+      jwtResourceName: res_data_dashboard_backend
     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
@@ -54,7 +54,7 @@ spec:
                 key: databasePassword
           ports:
             - name: http
-              containerPort: 8080
+              containerPort: 9000
               protocol: TCP
           livenessProbe:
             httpGet:

diff --git a/charts/data-dashboard-backend/values.yaml b/charts/data-dashboard-backend/values.yaml
@@ -38,7 +38,7 @@ service:
   # -- Kubernetes Service type
   type: ClusterIP
   # -- data-dashboard-backend port
-  port: 8080
+  port: 9000
 
 ingress:
   # -- Enable ingress controller resource
@@ -57,9 +57,7 @@ ingress:
   hosts:
     - localhost
   tls:
-    - hosts:
-          - localhost
-      secretName: radar-base-data-dashboard
+    secretName: radar-base-data-dashboard
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious