From 7d05fb918880e2b048044b63129fcfbd8d73ad93 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 16 Aug 2024 11:32:16 +0200
Subject: [PATCH] OZG-6178 remove mukAuth flag and enable muk and muk auth
together
---
.../ozgcloud_elstertransfer_operator_secret_read_role.yaml | 2 +-
.../ozgcloud_elstertransfer_operator_secret_write_role.yaml | 2 +-
...cloud_elstertransfer_operator_secret_read_role_test.yaml | 6 ------
...loud_elstertransfer_operator_secret_write_role_test.yaml | 6 ------
4 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/src/main/helm/templates/ozgcloud_elstertransfer_operator_secret_read_role.yaml b/src/main/helm/templates/ozgcloud_elstertransfer_operator_secret_read_role.yaml
index 41f71936e..38cd9d649 100644
--- a/src/main/helm/templates/ozgcloud_elstertransfer_operator_secret_read_role.yaml
+++ b/src/main/helm/templates/ozgcloud_elstertransfer_operator_secret_read_role.yaml
@@ -21,7 +21,7 @@
# Die sprachspezifischen Genehmigungen und Beschränkungen
# unter der Lizenz sind dem Lizenztext zu entnehmen.
#
-{{- if and (((.Values.ozgcloud).muk).enabled) (((.Values.ozgcloud).muk).authEnabled) }}
+{{- if (((.Values.ozgcloud).muk).enabled) }}
---
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
diff --git a/src/main/helm/templates/ozgcloud_elstertransfer_operator_secret_write_role.yaml b/src/main/helm/templates/ozgcloud_elstertransfer_operator_secret_write_role.yaml
index 0d310bd42..4f2838a69 100644
--- a/src/main/helm/templates/ozgcloud_elstertransfer_operator_secret_write_role.yaml
+++ b/src/main/helm/templates/ozgcloud_elstertransfer_operator_secret_write_role.yaml
@@ -21,7 +21,7 @@
# Die sprachspezifischen Genehmigungen und Beschränkungen
# unter der Lizenz sind dem Lizenztext zu entnehmen.
#
-{{- if and (((.Values.ozgcloud).muk).enabled) (((.Values.ozgcloud).muk).authEnabled) -}}
+{{- if (((.Values.ozgcloud).muk).enabled) }}
---
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
diff --git a/src/test/helm/ozgcloud_elstertransfer_operator_secret_read_role_test.yaml b/src/test/helm/ozgcloud_elstertransfer_operator_secret_read_role_test.yaml
index 3e1a28872..567ccae0b 100644
--- a/src/test/helm/ozgcloud_elstertransfer_operator_secret_read_role_test.yaml
+++ b/src/test/helm/ozgcloud_elstertransfer_operator_secret_read_role_test.yaml
@@ -38,7 +38,6 @@ tests:
ozgcloud:
muk:
enabled: true
- authEnabled: true
asserts:
- isKind:
of: RoleBinding
@@ -58,7 +57,6 @@ tests:
ozgcloud:
muk:
enabled: true
- authEnabled: true
asserts:
- contains:
path: subjects
@@ -74,7 +72,6 @@ tests:
ozgcloud:
muk:
enabled: true
- authEnabled: true
asserts:
- equal:
path: roleRef
@@ -91,7 +88,6 @@ tests:
ozgcloud:
muk:
enabled: true
- authEnabled: true
asserts:
- isKind:
of: Role
@@ -111,7 +107,6 @@ tests:
ozgcloud:
muk:
enabled: true
- authEnabled: true
asserts:
- contains:
path: rules
@@ -131,7 +126,6 @@ tests:
ozgcloud:
muk:
enabled: true
- authEnabled: true
asserts:
- failedTemplate:
errorMessage: elsterTransferOperator.namespace must be set
diff --git a/src/test/helm/ozgcloud_elstertransfer_operator_secret_write_role_test.yaml b/src/test/helm/ozgcloud_elstertransfer_operator_secret_write_role_test.yaml
index facf4a07e..af7d221d1 100644
--- a/src/test/helm/ozgcloud_elstertransfer_operator_secret_write_role_test.yaml
+++ b/src/test/helm/ozgcloud_elstertransfer_operator_secret_write_role_test.yaml
@@ -38,7 +38,6 @@ tests:
ozgcloud:
muk:
enabled: true
- authEnabled: true
asserts:
- isKind:
of: RoleBinding
@@ -58,7 +57,6 @@ tests:
ozgcloud:
muk:
enabled: true
- authEnabled: true
asserts:
- contains:
path: subjects
@@ -74,7 +72,6 @@ tests:
ozgcloud:
muk:
enabled: true
- authEnabled: true
asserts:
- equal:
path: roleRef
@@ -91,7 +88,6 @@ tests:
ozgcloud:
muk:
enabled: true
- authEnabled: true
asserts:
- isKind:
of: Role
@@ -111,7 +107,6 @@ tests:
ozgcloud:
muk:
enabled: true
- authEnabled: true
asserts:
- contains:
path: rules
@@ -129,7 +124,6 @@ tests:
ozgcloud:
muk:
enabled: true
- authEnabled: true
asserts:
- failedTemplate:
errorMessage: elsterTransferOperator.namespace must be set
--
GitLab