OZG-6177 update etr-user-cr

elster-transfer/templates/deployment.yaml

@@ -83,7 +83,7 @@ spec:
       volumes:
         - name: etr-home
           persistentVolumeClaim:
-            claimName: {{ .Release.Name }}-home-pvc2
+            claimName: {{ .Release.Name }}-home-pvc
         {{- if (.Values.userAuthentication).enabled }}
         - name: etr-user
           configMap:

elster-transfer/templates/elstertransfer_user_cr.yaml

@@ -8,7 +8,7 @@ metadata:
   name: {{ include "app.generateElsterTransferUserRessourceName" (deepCopy $user.login) }}
   namespace: {{ include "app.namespace" $ }}
 spec:
-  keep_after_delete: {{ $.Values.CR.keep_after_delete | default false }}
+  keep_after_delete: {{ $user.keep_after_delete | default false }}
   login: {{ $user.login }}  
   role: {{ $user.role | default "USER" }}
   credentials: {{ $user.credentials }}

elster-transfer/templates/etr_home_pvc.yaml

 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ .Release.Name }}-home-pvc2
+  name: {{ .Release.Name }}-home-pvc
   namespace: {{ .Release.Namespace }}
 spec:
   storageClassName: {{ (.Values.storage).className | default "ssd-retain" }}

elster-transfer/unit-tests/deployment_volume_mount_test.yaml

@@ -21,7 +21,7 @@ tests:
            content:
               name: etr-home
               persistentVolumeClaim:
-                claimName: etr-home-pvc2
+                claimName: etr-home-pvc
 
   - it: should add etr-user volume mount
     set:

elster-transfer/unit-tests/etr_home_pvc_test.yaml

@@ -16,7 +16,7 @@ tests:
     asserts:
       - equal:
           path: metadata.name
-          value: etr-home-pvc2
+          value: etr-home-pvc
       - equal:
           path: metadata.namespace
           value: by-helm-test