Merge pull request 'OZG-5238-DeploymentAufTest' (#35) from OZG-5238-DeploymentAufTest into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/administration/pulls/35


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

src/main/helm/templates/_helpers.tpl

@@ -60,10 +60,10 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 
 {{- define "app.ssoClientName" -}}
-{{- if (.Values.sso).client_name -}}
-{{ printf "%s" (.Values.sso).client_name }}
+{{- if (.Values.sso.keycloak_client).client_name -}}
+{{ printf "%s" (.Values.sso.keycloak_client).client_name }}
 {{- else -}}
-{{ printf "administration" }}
+{{ printf "admin" }}
 {{- end -}}
 {{- end -}}
 

src/main/helm/templates/keycloak_client_crd.yaml

 {{- if not (.Values.sso).disableOzgOperator -}}
-{{ range $client := (.Values.sso).keycloak_clients }}
+{{ $client := (.Values.sso).keycloak_client }}
 ---
 apiVersion: operator.ozgcloud.de/v1
 kind: OzgCloudKeycloakClient
@@ -32,5 +32,4 @@ spec:
 {{ toYaml . | indent 4 }}
     {{- end }}
   {{- end }}
-{{ end }}
 {{- end -}}
\ No newline at end of file

src/test/helm/deployment_defaults_sso_test.yaml

@@ -50,7 +50,7 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: ozgcloud_oauth2_resource
-            value: administration
+            value: admin
       - contains:
           path: spec.template.spec.containers[0].env
           content:
@@ -63,8 +63,6 @@ tests:
         bezeichner: eins-zwei-drei
         environment: dev
         bundesland: sh
-      sso:
-        serverUrl: https://sso.company.local
     asserts:
       - isKind:
           of: Deployment
@@ -77,8 +75,8 @@ tests:
   - it: check different client name
     set:
       sso:
+        keycloak_client:
           client_name: different-client
-        serverUrl: https://sso.company.local
     asserts:
       - isKind:
           of: Deployment

src/test/helm/keycloak_client_crd_test.yaml

@@ -37,8 +37,8 @@ tests:
   - it: should contain header data
     set:
       sso:
-        keycloak_clients:
-          - client_name: admin
+        keycloak_client:
+          client_name: admin
     asserts:
       - isAPIVersion:
           of: operator.ozgcloud.de/v1
@@ -47,8 +47,8 @@ tests:
   - it: should have metadata
     set:
       sso:
-        keycloak_clients:
-          - client_name: admin
+        keycloak_client:
+          client_name: admin
     asserts:
       - equal:
           path: metadata.name
@@ -59,8 +59,8 @@ tests:
   - it: should set keep after delete default to false
     set:
       sso:
-        keycloak_clients:
-          - client_name: admin
+        keycloak_client:
+          client_name: admin
     asserts:
       - equal:
           path: spec.keep_after_delete
@@ -69,8 +69,8 @@ tests:
     set:
       sso:
         keep_after_delete: true
-        keycloak_clients:
-          - client_name: admin
+        keycloak_client:
+          client_name: admin
     asserts:
       - equal:
           path: spec.keep_after_delete
@@ -78,8 +78,8 @@ tests:
   - it: has client name value
     set:
       sso:
-        keycloak_clients:
-          - client_name: admin
+        keycloak_client:
+          client_name: admin
     asserts:
       - equal:
           path: spec.client_name
@@ -87,8 +87,8 @@ tests:
   - it: should set client base url
     set:
       sso:
-        keycloak_clients:
-          - client_name: admin
+        keycloak_client:
+          client_name: admin
     asserts:
       - equal:
           path: spec.client_base_url
@@ -96,8 +96,8 @@ tests:
   - it: should set client redirect uris
     set:
       sso:
-        keycloak_clients:
-          - client_name: admin
+        keycloak_client:
+          client_name: admin
     asserts:
       - equal:
           path: spec.client_web_origins
@@ -106,8 +106,8 @@ tests:
   - it: should set client web origins
     set:
       sso:
-        keycloak_clients:
-          - client_name: admin
+        keycloak_client:
+          client_name: admin
     asserts:
       - equal:
           path: spec.client_redirect_uris
@@ -117,8 +117,8 @@ tests:
   - it: should use additional client web origins
     set:
       sso:
-        keycloak_clients:
-          - client_name: admin
+        keycloak_client:
+          client_name: admin
           additional_client_web_origins:
             - https://some.origin.de
             - https://some.other.origin.de
@@ -132,8 +132,8 @@ tests:
   - it: should use additional redirect uris for client web origins
     set:
       sso:
-        keycloak_clients:
-          - client_name: admin
+        keycloak_client:
+          client_name: admin
           additional_redirect_uris:
             - https://additional.url.de
     asserts:
@@ -146,8 +146,8 @@ tests:
   - it: should not create client cr if ozg operator is disabled
     set:
       sso:
-        keycloak_clients:
-          - client_name: admin
+        keycloak_client:
+          client_name: admin
         disableOzgOperator: true
     asserts:
       - hasDocuments: