From dd907e4d011a634ea66215fd863d74e7d9c423d8 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 16 May 2024 12:54:04 +0200
Subject: [PATCH] ozg-5722 remove kop operator
---
.../helm/templates/keycloak_client_crd.yaml | 9 --------
.../helm/templates/keycloak_user_crd.yaml | 9 --------
src/test/helm/keycloak_client_crd_test.yaml | 23 -------------------
src/test/helm/keycloak_user_crd_test.yaml | 22 ------------------
4 files changed, 63 deletions(-)
diff --git a/src/main/helm/templates/keycloak_client_crd.yaml b/src/main/helm/templates/keycloak_client_crd.yaml
index 5b0a6f8954..e64622d0f5 100644
--- a/src/main/helm/templates/keycloak_client_crd.yaml
+++ b/src/main/helm/templates/keycloak_client_crd.yaml
@@ -1,20 +1,11 @@
{{- if not (.Values.sso).disableOzgOperator -}}
{{ range $client := (.Values.sso).keycloak_clients }}
---
-{{- if $client.kopOperator }}
-apiVersion: api.kop-stack.de/v1
-kind: KopKeycloakClient
-{{- else }}
apiVersion: operator.ozgcloud.de/v1
kind: OzgCloudKeycloakClient
-{{- end }}
metadata:
name: {{ include "app.generateKeycloakClientRessourceName" $client.client_name }}
namespace: {{ include "app.namespace" $ }}
-{{- if $client.kopOperator }}
- annotations:
- "helm.sh/resource-policy": keep
-{{- end }}
spec:
keep_after_delete: {{ $.Values.sso.keep_after_delete | default false }}
client_name: {{ $client.client_name }}
diff --git a/src/main/helm/templates/keycloak_user_crd.yaml b/src/main/helm/templates/keycloak_user_crd.yaml
index 2901efba99..0f5470b0bc 100644
--- a/src/main/helm/templates/keycloak_user_crd.yaml
+++ b/src/main/helm/templates/keycloak_user_crd.yaml
@@ -1,20 +1,11 @@
{{- if not (.Values.sso).disableOzgOperator -}}
{{ range $user := concat ((.Values.sso).api_users | default list) ((.Values.sso).keycloak_users | default list) }}
---
-{{- if $user.kopOperator }}
-apiVersion: api.kop-stack.de/v1
-kind: KopKeycloakUser
-{{- else }}
apiVersion: operator.ozgcloud.de/v1
kind: OzgCloudKeycloakUser
-{{- end }}
metadata:
name: {{ include "app.generateKeycloakUserRessourceName" (deepCopy $user.name) }}
namespace: {{ include "app.namespace" $ }}
-{{- if $user.kopOperator }}
- annotations:
- "helm.sh/resource-policy": keep
-{{- end }}
spec:
keep_after_delete: {{ $.Values.sso.keep_after_delete | default false }}
update_user: {{ $user.update_user | default false }}
diff --git a/src/test/helm/keycloak_client_crd_test.yaml b/src/test/helm/keycloak_client_crd_test.yaml
index 17f2249b72..f84ce1e3db 100644
--- a/src/test/helm/keycloak_client_crd_test.yaml
+++ b/src/test/helm/keycloak_client_crd_test.yaml
@@ -58,29 +58,6 @@ tests:
- equal:
path: metadata.namespace
value: by-helm-test
- - it: should contain header data for kopOperator
- set:
- baseUrl: "test.by.ozg-cloud.de"
- sso:
- keycloak_clients:
- - client_name: alfa
- kopOperator: true
- asserts:
- - isAPIVersion:
- of: api.kop-stack.de/v1
- - isKind:
- of: KopKeycloakClient
- - it: should have annotations for kopOperator
- set:
- baseUrl: "test.by.ozg-cloud.de"
- sso:
- keycloak_clients:
- - client_name: alfa
- kopOperator: true
- asserts:
- - equal:
- path: metadata.annotations["helm.sh/resource-policy"]
- value: keep
- it: should have default Values
set:
baseUrl: test.by.ozg-cloud.de
diff --git a/src/test/helm/keycloak_user_crd_test.yaml b/src/test/helm/keycloak_user_crd_test.yaml
index 97d1116c82..2b8857fca6 100644
--- a/src/test/helm/keycloak_user_crd_test.yaml
+++ b/src/test/helm/keycloak_user_crd_test.yaml
@@ -533,28 +533,6 @@ tests:
- isNull:
path: spec.keycloak_user.client_roles
- - it: should use kopOperator
- set:
- ozgcloud:
- bundesland: by
- bezeichner: helm
- environment: test
- sso:
- keycloak_users:
- - name: kop
- kopOperator: true
- asserts:
- - isAPIVersion:
- of: api.kop-stack.de/v1
- - isKind:
- of: KopKeycloakUser
- - equal:
- path: spec.keycloak_user.username
- value: kop
- - equal:
- path: metadata.annotations["helm.sh/resource-policy"]
- value: keep
-
- it: should not create user cr if ozg operator is disabled
set:
sso:
--
GitLab