Skip to content
Snippets Groups Projects
Commit cb231089 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6178 mapp etr user login data to ozgcloud.muk.userName/password

parent c9688bbc
Branches
Tags
No related merge requests found
......@@ -125,7 +125,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- end -}}
{{- define "app.generateElsterTransferUserRessourceName" -}}
{{- $lowerUserName := printf "%s" (.Values.etr_user).login | lower }}
{{- $lowerUserName := printf "%s" ((.Values.ozgcloud).muk).userName | lower }}
{{- $alphanumericUserName := (include "app.replaceAllNonAlphanumeric" $lowerUserName ) }}
{{- printf "%s-elster-transfer-user" ( $alphanumericUserName | trunc 20) }}
{{- end -}}
......
......@@ -7,8 +7,8 @@ metadata:
namespace: {{ include "app.namespace" $ }}
spec:
keep_after_delete: {{ (.Values.etr_user).keep_after_delete | default false }}
login: {{ required "etr_user.login must be set if disableOzgElsterTransferOperator is enabled" (.Values.etr_user).login }}
login: {{ required ".Values.ozgcloud.muk.userName must be set if disableOzgElsterTransferOperator is enabled" (.Values.ozgcloud).muk.userName }}
role: {{ (.Values.etr_user).role | default "USER" }}
credentials: {{ required "etr_user.credentials must be set if disableOzgElsterTransferOperator is enabled" (.Values.etr_user).credentials }}
credentials: {{ required ".Values.ozgcloud.muk.password must be set if disableOzgElsterTransferOperator is enabled" (.Values.ozgcloud).muk.password }}
group: {{ (.Values.etr_user).group | default "Administratoren" }}
{{- end -}}
\ No newline at end of file
......@@ -26,6 +26,9 @@ ozgcloud:
environment: test
infoManager:
address: https://info-manager.my-wonderful-domain.local:9000
muk:
password: pswhash
userName: user0
networkPolicy:
dnsServerNamespace: test-dns-namespace
......@@ -35,6 +38,3 @@ imagePullSecret: test-image-pull-secret
elsterTransferOperator:
namespace: elster-transfer
\ No newline at end of file
etr_user:
credentials: pswhash
login: user0
\ No newline at end of file
......@@ -8,18 +8,20 @@ tests:
- it: should contain apiVersion
set:
disableOzgElsterTransferOperator: false
etr_user:
credentials: pswhash
login: user0
ozgcloud:
muk:
password: pswhash
userName: user0
asserts:
- isAPIVersion:
of: operator.ozgcloud.de/v1
- it: should contain basic info
set:
disableOzgElsterTransferOperator: false
etr_user:
credentials: pswhash
login: user0
ozgcloud:
muk:
password: pswhash
userName: user0
asserts:
- isKind:
of: OzgCloudElsterTransferUser
......@@ -28,18 +30,20 @@ tests:
- it: should have metadata name
set:
disableOzgElsterTransferOperator: false
etr_user:
credentials: pswhash
login: user0
ozgcloud:
muk:
password: pswhash
userName: user0
asserts:
- equal:
path: metadata.name
value: user0-elster-transfer-user
- it: should have metadata namespace
set:
etr_user:
credentials: pswhash
login: user0
ozgcloud:
muk:
password: pswhash
userName: user0
disableOzgElsterTransferOperator: false
asserts:
- equal:
......@@ -48,9 +52,10 @@ tests:
- it: should create cr if enabled
set:
disableOzgElsterTransferOperator: false
etr_user:
credentials: pswhash
login: user0
ozgcloud:
muk:
password: pswhash
userName: user0
asserts:
- hasDocuments:
count: 1
......@@ -62,20 +67,22 @@ tests:
- hasDocuments:
count: 0
- it: test user login must be set message
- it: test user userName must be set message
set:
disableOzgElsterTransferOperator: false
etr_user:
credentials: pswhash
ozgcloud:
muk:
password: pswhash
asserts:
- failedTemplate:
errorMessage: etr_user.login must be set if disableOzgElsterTransferOperator is enabled
- it: test user credentials must be set message
errorMessage: .Values.ozgcloud.muk.userName must be set if disableOzgElsterTransferOperator is enabled
- it: test user password must be set message
set:
disableOzgElsterTransferOperator: false
etr_user:
login: user0
ozgcloud:
muk:
userName: user0
asserts:
- failedTemplate:
errorMessage: etr_user.credentials must be set if disableOzgElsterTransferOperator is enabled
errorMessage: .Values.ozgcloud.muk.password must be set if disableOzgElsterTransferOperator is enabled
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment