update etr_user_cr

src/main/helm/templates/_helpers.tpl

@@ -123,14 +123,3 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{ include "app.bayernidAbsenderName" . }}
 {{- end -}}
 {{- end -}}
-
-{{- define "app.generateElsterTransferUserRessourceName" -}}
-{{- $lowerUserName := printf "%s" ((.Values.ozgcloud).muk).userName | lower }}
-{{- $alphanumericUserName :=  (include "app.replaceAllNonAlphanumeric" $lowerUserName ) }}
-{{- printf "%s-elster-transfer-user"  ( $alphanumericUserName | trunc 20) }}
-{{- end -}}
-
-
-{{- define "app.replaceAllNonAlphanumeric" -}}
-{{- trimAll "-" ( regexReplaceAll "[^a-zA-Z0-9-]" . "" ) }}
-{{- end -}}
\ No newline at end of file

src/main/helm/templates/elstertransfer_user_cr.yaml

@@ -27,11 +27,8 @@
 apiVersion: operator.ozgcloud.de/v1
 kind: OzgCloudElsterTransferUser
 metadata:
-  name: {{ include "app.generateElsterTransferUserRessourceName"  . }}
+  name: {{ include "app.namespace" . }}-etr-user
   namespace: {{ include "app.namespace" $ }}
 spec:
   keep_after_delete: {{ (.Values.etr_user).keep_after_delete | default false }}
-  login: {{ required ".Values.ozgcloud.muk.userName must be set if muk and auth is enabled" (.Values.ozgcloud).muk.userName }}  
-  role: {{ (.Values.etr_user).role | default "USER" }}
-  group: {{ (.Values.etr_user).group | default "Administratoren" }}
 {{- end -}}
\ No newline at end of file

src/test/helm/elster_transfer_user_cr_test.yaml

@@ -10,7 +10,6 @@ tests:
       ozgcloud:
         muk:
           enabled: true
-          userName: user0
           authEnabled: true    
     asserts:
       - isAPIVersion:
@@ -20,7 +19,6 @@ tests:
       ozgcloud:
         muk:
           enabled: true
-          userName: user0
           authEnabled: true 
     asserts:
       - isKind:
@@ -32,29 +30,48 @@ tests:
       ozgcloud:
         muk:
           enabled: true
-          userName: user0
           authEnabled: true 
     asserts:
       - equal:
           path: metadata.name
-          value: user0-elster-transfer-user
+          value: by-helm-test-etr-user
   - it: should have metadata namespace
     set:
       ozgcloud:
         muk:
           enabled: true
-          userName: user0
           authEnabled: true 
     asserts:
       - equal:
           path: metadata.namespace
           value: by-helm-test
+  - it: should have default spec
+    set:
+      ozgcloud:
+        muk:
+          enabled: true
+          authEnabled: true 
+    asserts:
+      - equal:
+          path: spec.keep_after_delete
+          value: false
+  - it: should set spec correctly
+    set:
+      ozgcloud:
+        muk:
+          enabled: true
+          authEnabled: true 
+      etr_user:
+        keep_after_delete: true
+    asserts:
+      - equal:
+          path: spec.keep_after_delete
+          value: true
   - it: should create cr if enabled
     set:
       ozgcloud:
         muk:
           enabled: true
-          userName: user0
           authEnabled: true 
     asserts:
       - hasDocuments:
@@ -64,15 +81,6 @@ tests:
     asserts:
       - hasDocuments:
           count: 0
-        
-  - it: test user userName must be set message
-    set:
-      ozgcloud:
-        muk:
-          enabled: true
-          authEnabled: true
-    asserts:
-      - failedTemplate:
-          errorMessage: .Values.ozgcloud.muk.userName must be set if muk and auth is enabled
+    
 
   
\ No newline at end of file