From d2ae76ffd3aacd7cbcb057bc86ca865abb5dea34 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Sat, 18 Nov 2023 14:27:05 +0100
Subject: [PATCH] OZG-4183 OZG-4584 adopt helm chart values
---
src/main/helm/templates/_helpers.tpl | 2 +-
.../helm/templates/api-password-secret.yaml | 2 +-
src/main/helm/templates/deployment.yaml | 18 +++++++++---------
src/main/helm/templates/ingress.yaml | 2 +-
src/main/helm/values.yaml | 2 +-
.../helm/deployment-keycloak-values-test.yaml | 14 +++++++-------
src/test/helm/deployment-url-value-test.yaml | 2 +-
...perator_secrets_read_role_binding_test.yaml | 2 +-
.../ozg_operator_secrets_read_role_test.yaml | 2 +-
...erator_secrets_write_role_binding_test.yaml | 2 +-
.../ozg_operator_secrets_write_role_test.yaml | 2 +-
src/test/unit-values.yaml | 2 ++
12 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index 7f319aa7..95ed6b69 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -98,7 +98,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{ printf "https://%s-%s.%s" (include "app.kopBezeichner" .) (include "app.name" .) .Values.baseUrl }}
{{- end -}}
-{{- define "app.goofyAddress" -}}
+{{- define "app.alfaAddress" -}}
{{ printf "https://%s.%s" (include "app.kopBezeichner" .) .Values.baseUrl }}
{{- end -}}
diff --git a/src/main/helm/templates/api-password-secret.yaml b/src/main/helm/templates/api-password-secret.yaml
index 8b416a93..dd058817 100644
--- a/src/main/helm/templates/api-password-secret.yaml
+++ b/src/main/helm/templates/api-password-secret.yaml
@@ -7,5 +7,5 @@ metadata:
{{- include "app.defaultLabels" . | indent 4 }}
type: Opaque
stringData:
- password: {{ required "kop.keycloak.api.password must be set" .Values.kop.keycloak.api.password }}
+ password: {{ required "usermanager.keycloak.api.password must be set" .Values.usermanager.keycloak.api.password }}
{{- end -}}
\ No newline at end of file
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index c00aeea6..8506d1be 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -64,22 +64,22 @@ spec:
key: connectionString.standard
optional: false
{{- if not (.Values.sso).api_user }}
- - name: KOP_KEYCLOAK_API_PASSWORD
+ - name: USERMANAGER_KEYCLOAK_API_PASSWORD
valueFrom:
secretKeyRef:
name: user-manager-api-password
key: password
optional: false
- - name: KOP_KEYCLOAK_API_USER
- value: {{ .Values.kop.keycloak.api.user }}
+ - name: USERMANAGER_KEYCLOAK_API_USER
+ value: {{ .Values.usermanager.keycloak.api.user }}
{{- else }}
- - name: KOP_KEYCLOAK_API_PASSWORD
+ - name: USERMANAGER_KEYCLOAK_API_PASSWORD
valueFrom:
secretKeyRef:
name: {{ include "app.generateKeycloakUserSecretName" . }}
key: password
optional: false
- - name: KOP_KEYCLOAK_API_USER
+ - name: USERMANAGER_KEYCLOAK_API_USER
valueFrom:
secretKeyRef:
name: {{ include "app.generateKeycloakUserSecretName" . }}
@@ -88,22 +88,22 @@ spec:
{{- end }}
- name: QUARKUS_MONGODB_DATABASE
value: {{ include "app.databaseName" . }}
- - name: KOP_KEYCLOAK_API_REALM
+ - name: USERMANAGER_KEYCLOAK_API_REALM
value: {{ include "app.ssoRealm" . }}
- - name: KOP_KEYCLOAK_API_CLIENT
+ - name: USERMANAGER_KEYCLOAK_API_CLIENT
value: {{ include "app.ssoClientName" . }}
- name: QUARKUS_OIDC_AUTH_SERVER_URL
value: {{ include "app.ssoServerUrl" . }}/realms/{{ include "app.ssoRealm" . }}
- name: KEYCLOAK_URL
value: {{ include "app.ssoServerUrl" . }}
- - name: KOP_USER_MANAGER_URL
+ - name: USERMANAGER_USER_MANAGER_URL
value: {{ include "app.baseUrl" . }}
{{- if ((.Values.ozgcloud).usersync).period }}
- name: OZGCLOUD_USERSYNC_PERIOD
value: {{ .Values.ozgcloud.usersync.period }}
{{- end }}
- name: QUARKUS_HTTP_CORS_ORIGINS
- value: {{ (include "app.goofyAddress" .) }}
+ value: {{ (include "app.alfaAddress" .) }}
{{- with (.Values.env).customList }}
{{ toYaml . | indent 8 }}
{{- end }}
diff --git a/src/main/helm/templates/ingress.yaml b/src/main/helm/templates/ingress.yaml
index 68307d45..f64baed6 100644
--- a/src/main/helm/templates/ingress.yaml
+++ b/src/main/helm/templates/ingress.yaml
@@ -28,7 +28,7 @@ metadata:
{{- with .Values.ingress.configuration_snippet}}
annotations: {{- toYaml . | nindent 4 }}
{{- end }}
- more_set_headers "Access-Control-Allow-Origin: {{ (include "app.goofyAddress" .) }}";
+ more_set_headers "Access-Control-Allow-Origin: {{ (include "app.alfaAddress" .) }}";
{{- if (.Values.ingress).use_staging_cert }}
cert-manager.io/cluster-issuer: letsencrypt-staging
{{- else }}
diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
index 78a2d651..49ea5ea4 100644
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -34,7 +34,7 @@ image:
database: # username is always <release-name>-database-user
databaseName: user-manager-database
-kop:
+usermanager:
keycloak:
api:
user: userManagerApiUser
diff --git a/src/test/helm/deployment-keycloak-values-test.yaml b/src/test/helm/deployment-keycloak-values-test.yaml
index 5aabfe98..684626f3 100644
--- a/src/test/helm/deployment-keycloak-values-test.yaml
+++ b/src/test/helm/deployment-keycloak-values-test.yaml
@@ -36,12 +36,12 @@ tests:
- contains:
path: spec.template.spec.containers[0].env
content:
- name: KOP_KEYCLOAK_API_USER
+ name: USERMANAGER_KEYCLOAK_API_USER
value: userManagerApiUser
- contains:
path: spec.template.spec.containers[0].env
content:
- name: KOP_KEYCLOAK_API_PASSWORD
+ name: USERMANAGER_KEYCLOAK_API_PASSWORD
valueFrom:
secretKeyRef:
name: user-manager-api-password
@@ -50,7 +50,7 @@ tests:
- contains:
path: spec.template.spec.containers[0].env
content:
- name: KOP_KEYCLOAK_API_REALM
+ name: USERMANAGER_KEYCLOAK_API_REALM
value: sh-helm-test
- contains:
path: spec.template.spec.containers[0].env
@@ -65,7 +65,7 @@ tests:
- contains:
path: spec.template.spec.containers[0].env
content:
- name: KOP_KEYCLOAK_API_CLIENT
+ name: USERMANAGER_KEYCLOAK_API_CLIENT
value: alfa
- it: should set keycloak client name
@@ -79,7 +79,7 @@ tests:
- contains:
path: spec.template.spec.containers[0].env
content:
- name: KOP_KEYCLOAK_API_CLIENT
+ name: USERMANAGER_KEYCLOAK_API_CLIENT
value: alfa
- it: sso.serverurl with https
@@ -128,7 +128,7 @@ tests:
- contains:
path: spec.template.spec.containers[0].env
content:
- name: KOP_KEYCLOAK_API_USER
+ name: USERMANAGER_KEYCLOAK_API_USER
valueFrom:
secretKeyRef:
name: usermanagerapiuser-credentials
@@ -137,7 +137,7 @@ tests:
- contains:
path: spec.template.spec.containers[0].env
content:
- name: KOP_KEYCLOAK_API_PASSWORD
+ name: USERMANAGER_KEYCLOAK_API_PASSWORD
valueFrom:
secretKeyRef:
name: usermanagerapiuser-credentials
diff --git a/src/test/helm/deployment-url-value-test.yaml b/src/test/helm/deployment-url-value-test.yaml
index 01b860ae..f0a102fe 100644
--- a/src/test/helm/deployment-url-value-test.yaml
+++ b/src/test/helm/deployment-url-value-test.yaml
@@ -36,5 +36,5 @@ tests:
- contains:
path: spec.template.spec.containers[0].env
content:
- name: KOP_USER_MANAGER_URL
+ name: USERMANAGER_USER_MANAGER_URL
value: https://helm-user-manager.test.sh.ozg-cloud.de
\ No newline at end of file
diff --git a/src/test/helm/ozg_operator_secrets_read_role_binding_test.yaml b/src/test/helm/ozg_operator_secrets_read_role_binding_test.yaml
index 469f7026..0f5af4d7 100644
--- a/src/test/helm/ozg_operator_secrets_read_role_binding_test.yaml
+++ b/src/test/helm/ozg_operator_secrets_read_role_binding_test.yaml
@@ -1,6 +1,6 @@
suite: test ozg_operator_secrets_read_role_binding
release:
- name: goofy
+ name: alfa
namespace: by-helm-test
templates:
- templates/ozg_operator_secrets_read_role_binding.yaml
diff --git a/src/test/helm/ozg_operator_secrets_read_role_test.yaml b/src/test/helm/ozg_operator_secrets_read_role_test.yaml
index bb033143..2f146815 100644
--- a/src/test/helm/ozg_operator_secrets_read_role_test.yaml
+++ b/src/test/helm/ozg_operator_secrets_read_role_test.yaml
@@ -1,6 +1,6 @@
suite: test ozg_operator_secrets_read_role
release:
- name: goofy
+ name: alfa
namespace: by-helm-test
templates:
- templates/ozg_operator_secrets_read_role.yaml
diff --git a/src/test/helm/ozg_operator_secrets_write_role_binding_test.yaml b/src/test/helm/ozg_operator_secrets_write_role_binding_test.yaml
index 75a0fbfc..3074359a 100644
--- a/src/test/helm/ozg_operator_secrets_write_role_binding_test.yaml
+++ b/src/test/helm/ozg_operator_secrets_write_role_binding_test.yaml
@@ -1,6 +1,6 @@
suite: test ozg_operator_secrets_role_binding
release:
- name: goofy
+ name: alfa
namespace: by-helm-test
templates:
- templates/ozg_operator_secrets_write_role_binding.yaml
diff --git a/src/test/helm/ozg_operator_secrets_write_role_test.yaml b/src/test/helm/ozg_operator_secrets_write_role_test.yaml
index f85082a9..215f844a 100644
--- a/src/test/helm/ozg_operator_secrets_write_role_test.yaml
+++ b/src/test/helm/ozg_operator_secrets_write_role_test.yaml
@@ -1,6 +1,6 @@
suite: test ozg_operator_secrets_write_role
release:
- name: goofy
+ name: alfa
namespace: by-helm-test
templates:
- templates/ozg_operator_secrets_write_role.yaml
diff --git a/src/test/unit-values.yaml b/src/test/unit-values.yaml
index 7b215035..1c14973f 100644
--- a/src/test/unit-values.yaml
+++ b/src/test/unit-values.yaml
@@ -28,6 +28,8 @@ kop:
bundesland: sh
bezeichner: helm
environment: test
+
+usermanager:
keycloak:
api:
password: geheim
--
GitLab