From 5014cddd83ad14a38a002298f7fc8eec33c8f89a Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 23 Jul 2024 22:43:48 +0200
Subject: [PATCH] OZG-6177 add create configmap role
---
elster-transfer/templates/_helpers.tpl | 6 ++++--
...ertransfer_user_crd.yaml => elstertransfer_user_cr.yaml} | 2 +-
...d_elstertransfer_operator_configmap_read_write_role.yaml | 2 +-
...tertransfer_operator_configmap_read_write_role_test.yaml | 5 +++--
4 files changed, 9 insertions(+), 6 deletions(-)
rename elster-transfer/templates/{elstertransfer_user_crd.yaml => elstertransfer_user_cr.yaml} (90%)
diff --git a/elster-transfer/templates/_helpers.tpl b/elster-transfer/templates/_helpers.tpl
index 4b844f6..117e6b0 100644
--- a/elster-transfer/templates/_helpers.tpl
+++ b/elster-transfer/templates/_helpers.tpl
@@ -28,9 +28,11 @@ helm.sh/chart: {{ include "app.chart" . }}
{{- end -}}
-{{/* Namespace */}}
{{- define "app.namespace" -}}
-{{- default .Release.Namespace | toString | trunc 63 | trimSuffix "-" -}}
+{{- if gt (len (.Release.Namespace)) 63 -}}
+{{- fail (printf ".Release.Namespace %s ist zu lang (max. 63 Zeichen)" .Release.Namespace) -}}
+{{- end -}}
+{{ printf "%s" .Release.Namespace }}
{{- end -}}
{{- define "app.matchLabels" }}
diff --git a/elster-transfer/templates/elstertransfer_user_crd.yaml b/elster-transfer/templates/elstertransfer_user_cr.yaml
similarity index 90%
rename from elster-transfer/templates/elstertransfer_user_crd.yaml
rename to elster-transfer/templates/elstertransfer_user_cr.yaml
index a658b4a..9d2f5cc 100644
--- a/elster-transfer/templates/elstertransfer_user_crd.yaml
+++ b/elster-transfer/templates/elstertransfer_user_cr.yaml
@@ -7,7 +7,7 @@ metadata:
spec:
keep_after_delete: {{ (.Values.user).keep_after_delete | default false }}
login: {{ (.Values.user).name }}
- role: {{ (.Values.user).role | default "ADMIN" }}
+ role: {{ (.Values.user).role | default "USER" }}
credentials: {{ (.Values.user).credentials }}
group: {{ (.Values.user).group | default "Administratoren" }}
{{- end }}
diff --git a/elster-transfer/templates/ozgcloud_elstertransfer_operator_configmap_read_write_role.yaml b/elster-transfer/templates/ozgcloud_elstertransfer_operator_configmap_read_write_role.yaml
index 3f035cd..7fc3830 100644
--- a/elster-transfer/templates/ozgcloud_elstertransfer_operator_configmap_read_write_role.yaml
+++ b/elster-transfer/templates/ozgcloud_elstertransfer_operator_configmap_read_write_role.yaml
@@ -45,4 +45,4 @@ metadata:
rules:
- apiGroups: [""]
resources: ["configmaps"]
- verbs: ["get", "list", "watch", "update", "patch"]
\ No newline at end of file
+ verbs: ["create", "get", "list", "watch", "update", "patch"]
\ No newline at end of file
diff --git a/elster-transfer/unit-tests/ozgcloud_elstertransfer_operator_configmap_read_write_role_test.yaml b/elster-transfer/unit-tests/ozgcloud_elstertransfer_operator_configmap_read_write_role_test.yaml
index 945c04c..5582357 100644
--- a/elster-transfer/unit-tests/ozgcloud_elstertransfer_operator_configmap_read_write_role_test.yaml
+++ b/elster-transfer/unit-tests/ozgcloud_elstertransfer_operator_configmap_read_write_role_test.yaml
@@ -79,13 +79,14 @@ tests:
path: rules
content:
apiGroups:
- - ""
+ - ""
resources:
- configmaps
verbs:
+ - create
- get
- list
- watch
- update
- - patch
+ - patch
documentIndex: 1
\ No newline at end of file
--
GitLab