From 21e76f2836d7e6b618d13cf9f18850a9c969d265 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 30 Nov 2023 11:32:40 +0100
Subject: [PATCH] OZG-4188 OZG-4555 revert renaming based on code review
comments
---
src/main/helm/templates/keycloak-client-crd.yaml | 2 +-
src/main/helm/templates/keycloak-user-crd.yaml | 8 ++++----
src/test/helm/keycloak-client-crd-test.yaml | 4 ++--
src/test/helm/keycloak-user-crd-test.yaml | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/helm/templates/keycloak-client-crd.yaml b/src/main/helm/templates/keycloak-client-crd.yaml
index a51a8acfec..f4873456d3 100644
--- a/src/main/helm/templates/keycloak-client-crd.yaml
+++ b/src/main/helm/templates/keycloak-client-crd.yaml
@@ -10,7 +10,7 @@ kind: OzgKeycloakClient
metadata:
name: {{ include "app.generateKeycloakClientRessourceName" $client.client_name }}
namespace: {{ include "app.namespace" $ }}
-{{- if $client.ozgcloudOperator }}
+{{- if $client.kopOperator }}
annotations:
"helm.sh/resource-policy": keep
{{- end }}
diff --git a/src/main/helm/templates/keycloak-user-crd.yaml b/src/main/helm/templates/keycloak-user-crd.yaml
index 03c7f33b81..38593ecf9d 100644
--- a/src/main/helm/templates/keycloak-user-crd.yaml
+++ b/src/main/helm/templates/keycloak-user-crd.yaml
@@ -1,8 +1,8 @@
{{ range $user := concat (.Values.sso.api_users | default list) (.Values.sso.keycloak_users | default list) }}
---
-{{- if $user.ozgcloudOperator }}
-apiVersion: api.ozgcloud-stack.de/v1
-kind: OzgcloudKeycloakUser
+{{- if $user.kopOperator }}
+apiVersion: api.kop-stack.de/v1
+kind: KopKeycloakUser
{{- else }}
apiVersion: operator.ozgcloud.de/v1
kind: OzgKeycloakUser
@@ -10,7 +10,7 @@ kind: OzgKeycloakUser
metadata:
name: {{ include "app.generateKeycloakUserRessourceName" (deepCopy $user.name) }}
namespace: {{ include "app.namespace" $ }}
-{{- if $user.ozgcloudOperator }}
+{{- if $user.kopOperator }}
annotations:
"helm.sh/resource-policy": keep
{{- end }}
diff --git a/src/test/helm/keycloak-client-crd-test.yaml b/src/test/helm/keycloak-client-crd-test.yaml
index 413f277595..b1a89c2178 100644
--- a/src/test/helm/keycloak-client-crd-test.yaml
+++ b/src/test/helm/keycloak-client-crd-test.yaml
@@ -51,12 +51,12 @@ tests:
- equal:
path: metadata.namespace
value: by-helm-test
- - it: should contain header data for ozgcloudOperator
+ - it: should contain header data for kopOperator
set:
sso:
keycloak_clients:
- client_name: alfa
- ozgcloudOperator: true
+ kopOperator: true
asserts:
- isAPIVersion:
of: api.ozgcloud-stack.de/v1
diff --git a/src/test/helm/keycloak-user-crd-test.yaml b/src/test/helm/keycloak-user-crd-test.yaml
index e9f8c71a7c..8d33dc1f26 100644
--- a/src/test/helm/keycloak-user-crd-test.yaml
+++ b/src/test/helm/keycloak-user-crd-test.yaml
@@ -541,8 +541,8 @@ tests:
environment: test
sso:
keycloak_users:
- - name: ozgcloud
- ozgcloudOperator: true
+ - name: kop
+ kopOperator: true
asserts:
- isAPIVersion:
of: api.ozgcloud-stack.de/v1
--
GitLab