From ddcbd7115ca0718056d5a3b2563c388245ae9a82 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 7 Aug 2024 23:00:50 +0200
Subject: [PATCH] set muk userName password env
---
src/main/helm/templates/deployment.yaml | 6 ++++
src/test/helm/deployment_muk_test.yaml | 48 +++++++++++++++++++++++++
2 files changed, 54 insertions(+)
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index cbb3ae56d..3d41cc111 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -190,6 +190,12 @@ spec:
value: {{ quote (required "ozgcloud.muk.sender must be set if ozgcloud.muk is enabled" ((.Values.ozgcloud).muk).sender) }}
- name: ozgcloud_muk_server
value: {{ quote (required "ozgcloud.muk.server must be set if ozgcloud.muk is enabled" ((.Values.ozgcloud).muk).server) }}
+ {{- if ((.Values.ozgcloud).muk).authEnabled }}
+ - name: ozgcloud_muk_userName
+ value: {{ quote (required "ozgcloud.muk.userName must be set if ozgcloud.muk auth is enabled" ((.Values.ozgcloud).muk).userName) }}
+ - name: ozgcloud_muk_password
+ value: {{ quote (required "ozgcloud.muk.password must be set if ozgcloud.muk auth is enabled" ((.Values.ozgcloud).muk).password) }}
+ {{- end }}
{{- end }}
diff --git a/src/test/helm/deployment_muk_test.yaml b/src/test/helm/deployment_muk_test.yaml
index 33c02db5f..745846623 100644
--- a/src/test/helm/deployment_muk_test.yaml
+++ b/src/test/helm/deployment_muk_test.yaml
@@ -38,8 +38,11 @@ tests:
ozgcloud:
muk:
enabled: true
+ authEnabled: true
server: muk.test.ozg.de
sender: "name"
+ userName: user
+ password: psw
asserts:
- contains:
path: spec.template.spec.containers[0].env
@@ -51,6 +54,17 @@ tests:
content:
name: ozgcloud_muk_server
value: muk.test.ozg.de
+ - contains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: ozgcloud_muk_userName
+ value: "user"
+ - contains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: ozgcloud_muk_password
+ value: "psw"
+
- it: should not by default set muk values
asserts:
- notContains:
@@ -63,6 +77,16 @@ tests:
content:
name: ozgcloud_muk_server
any: true
+ - notContains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: ozgcloud_muk_userName
+ any: true
+ - notContains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: ozgcloud_muk_password
+ any: true
- it: should fail if sender name is not set
set:
@@ -84,6 +108,30 @@ tests:
asserts:
- failedTemplate:
errorMessage: "ozgcloud.muk.server must be set if ozgcloud.muk is enabled"
+ - it: should fail if muk user is not set when muk enabled and auth enabled
+ set:
+ ozgcloud:
+ muk:
+ enabled: true
+ authEnabled: true
+ sender: "name"
+ server: muk.test.ozg.de
+ password: psw
+ asserts:
+ - failedTemplate:
+ errorMessage: "ozgcloud.muk.userName must be set if ozgcloud.muk auth is enabled"
+ - it: should fail if muk password is not set when muk enabled and auth enabled
+ set:
+ ozgcloud:
+ muk:
+ enabled: true
+ authEnabled: true
+ sender: "name"
+ server: muk.test.ozg.de
+ userName: user
+ asserts:
+ - failedTemplate:
+ errorMessage: "ozgcloud.muk.password must be set if ozgcloud.muk auth is enabled"
--
GitLab