update etr_user_cr

src/main/helm/templates/elstertransfer_user_cr.yaml

 
-{{- if not .Values.disableOzgElsterTransferOperator -}}
+{{- if and (((.Values.ozgcloud).muk).enabled) (((.Values.ozgcloud).muk).authEnabled) -}}
 apiVersion: operator.ozgcloud.de/v1
 kind: OzgCloudElsterTransferUser
 metadata:
@@ -7,8 +7,8 @@ metadata:
   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 disableOzgElsterTransferOperator is enabled" (.Values.ozgcloud).muk.userName }}  
+  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" }}
-  credentials: {{ required ".Values.ozgcloud.muk.password must be set if disableOzgElsterTransferOperator is enabled" (.Values.ozgcloud).muk.password }}
+  credentials: {{ required ".Values.ozgcloud.muk.password must be set if muk and auth is enabled" (.Values.ozgcloud).muk.password }}
   group: {{ (.Values.etr_user).group | default "Administratoren" }}
 {{- end -}}
\ No newline at end of file

src/test/helm/elster_transfer_user_cr_test.yaml

@@ -7,11 +7,12 @@ templates:
 tests:
   - it: should contain apiVersion
     set:
-      disableOzgElsterTransferOperator: false
       ozgcloud:
         muk:
+          enabled: true
           password: pswhash
           userName: user0
+          authEnabled: true    
     asserts:
       - isAPIVersion:
           of: operator.ozgcloud.de/v1
@@ -20,8 +21,10 @@ tests:
       disableOzgElsterTransferOperator: false
       ozgcloud:
         muk:
+          enabled: true
           password: pswhash
           userName: user0
+          authEnabled: true 
     asserts:
       - isKind:
           of: OzgCloudElsterTransferUser
@@ -29,11 +32,12 @@ tests:
           of: operator.ozgcloud.de/v1
   - it: should have metadata name
     set:
-      disableOzgElsterTransferOperator: false
       ozgcloud:
         muk:
+          enabled: true
           password: pswhash
           userName: user0
+          authEnabled: true 
     asserts:
       - equal:
           path: metadata.name
@@ -42,47 +46,50 @@ tests:
     set:
       ozgcloud:
         muk:
+          enabled: true
           password: pswhash
           userName: user0
-      disableOzgElsterTransferOperator: false
+          authEnabled: true 
     asserts:
       - equal:
           path: metadata.namespace
           value: by-helm-test
   - it: should create cr if enabled
     set:
-      disableOzgElsterTransferOperator: false
       ozgcloud:
         muk:
+          enabled: true
           password: pswhash
           userName: user0
+          authEnabled: true 
     asserts:
       - hasDocuments:
           count: 1
         
-  - it: should NOT create cr if not enabled
-    set:
-      disableOzgElsterTransferOperator: true
+  - it: should NOT create cr by default
     asserts:
       - hasDocuments:
           count: 0
         
   - it: test user userName must be set message
     set:
-      disableOzgElsterTransferOperator: false
       ozgcloud:
         muk:
+          enabled: true
           password: pswhash
+          authEnabled: true
     asserts:
       - failedTemplate:
-          errorMessage: .Values.ozgcloud.muk.userName must be set if disableOzgElsterTransferOperator is enabled
+          errorMessage: .Values.ozgcloud.muk.userName must be set if muk and auth is enabled
+
   - it: test user password must be set message
     set:
-      disableOzgElsterTransferOperator: false
       ozgcloud:
         muk:
+          enabled: true
           userName: user0
+          authEnabled: true 
     asserts:
       - failedTemplate:
-          errorMessage: .Values.ozgcloud.muk.password must be set if disableOzgElsterTransferOperator is enabled
+          errorMessage: .Values.ozgcloud.muk.password must be set if muk and auth is enabled
   
\ No newline at end of file