From 0d26c4f3d99666c268f6c73a0ac3bbd774e11a1d Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 25 Jul 2024 11:26:26 +0200
Subject: [PATCH] OZG-6177 update etr-user-cr
---
elster-transfer/templates/deployment.yaml | 2 +-
elster-transfer/templates/elstertransfer_user_cr.yaml | 2 +-
elster-transfer/templates/etr_home_pvc.yaml | 2 +-
elster-transfer/unit-tests/deployment_volume_mount_test.yaml | 2 +-
elster-transfer/unit-tests/etr_home_pvc_test.yaml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/elster-transfer/templates/deployment.yaml b/elster-transfer/templates/deployment.yaml
index 6b047c6..9ebaaa9 100644
--- a/elster-transfer/templates/deployment.yaml
+++ b/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:
diff --git a/elster-transfer/templates/elstertransfer_user_cr.yaml b/elster-transfer/templates/elstertransfer_user_cr.yaml
index 7333862..4f6d763 100644
--- a/elster-transfer/templates/elstertransfer_user_cr.yaml
+++ b/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 }}
diff --git a/elster-transfer/templates/etr_home_pvc.yaml b/elster-transfer/templates/etr_home_pvc.yaml
index 259e349..4ba0373 100644
--- a/elster-transfer/templates/etr_home_pvc.yaml
+++ b/elster-transfer/templates/etr_home_pvc.yaml
@@ -1,7 +1,7 @@
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" }}
diff --git a/elster-transfer/unit-tests/deployment_volume_mount_test.yaml b/elster-transfer/unit-tests/deployment_volume_mount_test.yaml
index 156b776..093e4f6 100644
--- a/elster-transfer/unit-tests/deployment_volume_mount_test.yaml
+++ b/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:
diff --git a/elster-transfer/unit-tests/etr_home_pvc_test.yaml b/elster-transfer/unit-tests/etr_home_pvc_test.yaml
index a338e9f..fb125ac 100644
--- a/elster-transfer/unit-tests/etr_home_pvc_test.yaml
+++ b/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
--
GitLab