From 9548495de93138cb68539be85a232495b13505ec Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 30 Nov 2023 12:21:59 +0100
Subject: [PATCH] OZG-4188 OZG-4555 fix helm units
---
src/main/helm/templates/keycloak-client-crd.yaml | 6 +++---
src/test/helm/keycloak-client-crd-test.yaml | 10 +++++-----
src/test/helm/keycloak-user-crd-test.yaml | 6 +++---
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/helm/templates/keycloak-client-crd.yaml b/src/main/helm/templates/keycloak-client-crd.yaml
index f4873456d3..1e5509d911 100644
--- a/src/main/helm/templates/keycloak-client-crd.yaml
+++ b/src/main/helm/templates/keycloak-client-crd.yaml
@@ -1,8 +1,8 @@
{{ range $client := .Values.sso.keycloak_clients }}
---
-{{- if $client.ozgcloudOperator }}
-apiVersion: api.ozgcloud-stack.de/v1
-kind: OzgcloudKeycloakClient
+{{- if $client.kopOperator }}
+apiVersion: api.kop-stack.de/v1
+kind: KopKeycloakClient
{{- else }}
apiVersion: operator.ozgcloud.de/v1
kind: OzgKeycloakClient
diff --git a/src/test/helm/keycloak-client-crd-test.yaml b/src/test/helm/keycloak-client-crd-test.yaml
index b1a89c2178..4b929a7c1d 100644
--- a/src/test/helm/keycloak-client-crd-test.yaml
+++ b/src/test/helm/keycloak-client-crd-test.yaml
@@ -59,15 +59,15 @@ tests:
kopOperator: true
asserts:
- isAPIVersion:
- of: api.ozgcloud-stack.de/v1
+ of: api.kop-stack.de/v1
- isKind:
- of: OzgcloudKeycloakClient
- - it: should have annotations for ozgcloudOperator
+ of: KopKeycloakClient
+ - it: should have annotations for kopOperator
set:
sso:
keycloak_clients:
- client_name: alfa
- ozgcloudOperator: true
+ kopOperator: true
asserts:
- equal:
path: metadata.annotations.[helm.sh/resource-policy]
@@ -225,7 +225,7 @@ tests:
asserts:
- equal:
path: spec.protocol_mappers
- value:
+ value:
- name: organisationseinheitIdMapper
protocol: openid-connect
protocolMapper: oidc-usermodel-attribute-mapper
diff --git a/src/test/helm/keycloak-user-crd-test.yaml b/src/test/helm/keycloak-user-crd-test.yaml
index edd408de92..d2a2cf7da2 100644
--- a/src/test/helm/keycloak-user-crd-test.yaml
+++ b/src/test/helm/keycloak-user-crd-test.yaml
@@ -545,12 +545,12 @@ tests:
kopOperator: true
asserts:
- isAPIVersion:
- of: api.ozgcloud-stack.de/v1
+ of: api.kop-stack.de/v1
- isKind:
- of: OzgcloudKeycloakUser
+ of: KopKeycloakUser
- equal:
path: spec.keycloak_user.username
- value: ozgcloud
+ value: kop
- equal:
path: metadata.annotations.[helm.sh/resource-policy]
value: keep
\ No newline at end of file
--
GitLab