Merge branch 'feature/fix-helm-charts' into 'develop'

fix helm chart

See merge request !104

charts/README.md

@@ -35,6 +35,10 @@ The environment variables listed below are used to define the connection details
     - This value is generated using the `microservices.backend.url` Helm template and points to the `/auth` endpoint of the Keycloak service.
 - `KEYCLOAK_APP_REALM`: The realm to be used for the application within Keycloak.
     - Value is derived from the `global.profile` specified in the Helm values.
+- `KEYCLOAK_MASTER_USER`: The username to be used for the master realm in keycloak.
+  - Value is derived from the `keycloak.master.user` specified in the Helm values.
+- `KEYCLOAK_MASTER_PASSWORD`: The password to be used for the master realm in keycloak.
+  - Value is derived from the `keycloak.master.password` specified in the Helm values.
 
 ### Client Authority Configuration
 
@@ -71,4 +75,9 @@ redis:
   port: "6379"
   username: "default"
   password: "admin"
+
+keycloak:
+  master:
+    user: "user"
+    password: "admin"
 ```

charts/templates/configmap.yaml

@@ -14,5 +14,8 @@ data:
 
   KEYCLOAK_URL: "{{- include "microservices.backend.url" . }}/auth"
   KEYCLOAK_APP_REALM: "{{ .Values.global.profile }}"
+  KEYCLOAK_MASTER_USER: "{{ .Values.keycloak.master.user }}"
+  KEYCLOAK_MASTER_PASSWORD: "{{ .Values.keycloak.master.password }}"
+
   CLIENT_AUTHORITY_URL: "{{- include "tls.gateway.url" . }}"
   CLIENT_CERTIFICATE_PASSWORD: "{{ .Values.global.keystore.password }}"
\ No newline at end of file

charts/values.yaml

@@ -118,3 +118,8 @@ redis:
   port: "6379"
   username: "default"
   password: "admin"
+
+keycloak:
+  master:
+    user: "user"
+    password: "admin"
\ No newline at end of file

src/main/resources/application-local.yml

-
 spring:
   data:
     redis:
@@ -20,11 +19,12 @@ logging:
 
 keycloak:
   url: http://localhost:9010/auth
+  master:
+    user: user
+    password: admin
   app:
     realm: authority
     client-id: frontend-cli
-  master:
-    user: user
 client:
   certificate-password: authority
   authority:

src/main/resources/application.yml

@@ -34,8 +34,8 @@ keycloak:
   master:
     realm: master
     client-id: admin-cli
-    user: user
-    password: admin
+    user: [KEYCLOAK_USER]
+    password: [KEYCLOAK_PASSWORD]
   app:
     realm: [KEYCLOAK_APP_REALM]
     client-id: frontend-cli