OZG-4183 OZG-4584 adopt helm chart values

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 -}}
 

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

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 }}

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 }}

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

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

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

src/test/helm/ozg_operator_secrets_read_role_binding_test.yaml

 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

src/test/helm/ozg_operator_secrets_read_role_test.yaml

 suite: test ozg_operator_secrets_read_role
 release:
-  name: goofy
+  name: alfa
   namespace: by-helm-test
 templates:
   - templates/ozg_operator_secrets_read_role.yaml

src/test/helm/ozg_operator_secrets_write_role_binding_test.yaml

 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

src/test/helm/ozg_operator_secrets_write_role_test.yaml

 suite: test ozg_operator_secrets_write_role
 release:
-  name: goofy
+  name: alfa
   namespace: by-helm-test
 templates:
   - templates/ozg_operator_secrets_write_role.yaml

src/test/unit-values.yaml

@@ -28,6 +28,8 @@ kop:
   bundesland: sh
   bezeichner: helm
   environment: test
+
+usermanager:
   keycloak:
     api:
       password: geheim