Merge branch 'master' into OZG-7047-tooltip-improvement

src/main/helm/templates/keycloak_crd.yaml

@@ -22,8 +22,7 @@
 # unter der Lizenz sind dem Lizenztext zu entnehmen.
 #
 
-{{- if not (.Values.sso).disableOzgOperator -}}
----
+{{ if not (.Values.sso).disableOzgOperator -}}
 apiVersion: operator.ozgcloud.de/v1
 kind: OzgCloudKeycloakRealm
 metadata:
@@ -31,7 +30,8 @@ metadata:
   namespace: {{ include "app.namespace" . }}
 spec:
   keep_after_delete: {{ (.Values.sso).keep_after_delete | default false }}
-  displayName: {{ include "app.ssoRealmDisplayName" . }}  
+  displayName: {{ include "app.ssoRealmDisplayName" . }}
+  bundesland: {{ include "app.ozgcloudBundesland" . }}
   {{- with ((.Values.sso).keycloak_realm).roles }}
   realmRoles: 
 {{ toYaml . | indent 4}}

src/test/helm/keycloak_crd_test.yaml

@@ -32,6 +32,7 @@ set:
   ozgcloud:
     environment: test
     bezeichner: helm
+    bundesland: sh
 tests:
   - it: should contain header data
     asserts:
@@ -136,4 +137,9 @@ tests:
   - it: should not create realm roles by default
     asserts:
       - isNull:
-          path: spec.realmRoles
\ No newline at end of file
+          path: spec.realmRoles
+  - it: should have a bundesland
+    asserts:
+      - equal:
+          path: spec.bundesland
+          value: sh
\ No newline at end of file