fix configure and add KeycloakRealmGroup

aenix-io · Nov 25, 2024 · f02bbf0 · f02bbf0
1 parent 4f58d24
commit f02bbf0
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 13 deletions.
diff --git a/packages/apps/tenant/templates/keycloakgroups.yaml b/packages/apps/tenant/templates/keycloakgroups.yaml
@@ -2,44 +2,48 @@ apiVersion: v1.edp.epam.com/v1
 kind: KeycloakRealmGroup
 metadata:
   name: {{ include "tenant.name" . }}-view
+  namespace: {{ include "tenant.name" . }}
 spec:
   name: {{ include "tenant.name" . }}-view
   realmRef:
     name: keycloakrealm-cozy
-    kind: KeycloakRealm
+    kind: ClusterKeycloakRealm
 
 ---
 
 apiVersion: v1.edp.epam.com/v1
 kind: KeycloakRealmGroup
 metadata:
   name: {{ include "tenant.name" . }}-use
+  namespace: {{ include "tenant.name" . }}
 spec:
   name: {{ include "tenant.name" . }}-use
   realmRef:
     name: keycloakrealm-cozy
-    kind: KeycloakRealm
+    kind: ClusterKeycloakRealm
 
 ---
 
 apiVersion: v1.edp.epam.com/v1
 kind: KeycloakRealmGroup
 metadata:
   name: {{ include "tenant.name" . }}-admin
+  namespace: {{ include "tenant.name" . }}
 spec:
   name: {{ include "tenant.name" . }}-admin
   realmRef:
     name: keycloakrealm-cozy
-    kind: KeycloakRealm
+    kind: ClusterKeycloakRealm
 
 ---
 
 apiVersion: v1.edp.epam.com/v1
 kind: KeycloakRealmGroup
 metadata:
   name: {{ include "tenant.name" . }}-super-admin
+  namespace: {{ include "tenant.name" . }}
 spec:
   name: {{ include "tenant.name" . }}-super-admin
   realmRef:
     name: keycloakrealm-cozy
-    kind: KeycloakRealm
+    kind: ClusterKeycloakRealm
diff --git a/packages/core/platform/bundles/distro-full.yaml b/packages/core/platform/bundles/distro-full.yaml
@@ -188,3 +188,10 @@ releases:
   namespace: cozy-keycloak
   optional: true
   dependsOn: [keycloak]
+
+- name: keycloak-configure
+  releaseName: keycloak-configure
+  chart: cozy-keycloak-configure
+  namespace: cozy-keycloak
+  optional: true
+  dependsOn: [keycloak-operator]
diff --git a/packages/core/platform/bundles/distro-hosted.yaml b/packages/core/platform/bundles/distro-hosted.yaml
@@ -138,3 +138,10 @@ releases:
   namespace: cozy-keycloak
   optional: true
   dependsOn: [keycloak]
+
+- name: keycloak-configure
+  releaseName: keycloak-configure
+  chart: cozy-keycloak-configure
+  namespace: cozy-keycloak
+  optional: true
+  dependsOn: [keycloak-operator]
diff --git a/packages/core/platform/bundles/paas-full.yaml b/packages/core/platform/bundles/paas-full.yaml
@@ -261,3 +261,9 @@ releases:
   chart: cozy-keycloak-operator
   namespace: cozy-keycloak
   dependsOn: [keycloak]
+
+- name: keycloak-configure
+  releaseName: keycloak-configure
+  chart: cozy-keycloak-configure
+  namespace: cozy-keycloak
+  dependsOn: [keycloak-operator]
diff --git a/packages/core/platform/bundles/paas-hosted.yaml b/packages/core/platform/bundles/paas-hosted.yaml
@@ -157,3 +157,9 @@ releases:
   chart: cozy-keycloak-operator
   namespace: cozy-keycloak
   dependsOn: [keycloak]
+
+- name: keycloak-configure
+  releaseName: keycloak-configure
+  chart: cozy-keycloak-configure
+  namespace: cozy-keycloak
+  dependsOn: [keycloak-operator]
diff --git a/packages/system/keycloak-configure/Chart.yaml b/packages/system/keycloak-configure/Chart.yaml
@@ -0,0 +1,3 @@
+apiVersion: v2
+name: cozy-keycloak-configure
+version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
diff --git a/...loak-operator/templates/configure-kk.yaml → ...oak-configure/templates/configure-kk.yaml b/...loak-operator/templates/configure-kk.yaml → ...oak-configure/templates/configure-kk.yaml
@@ -3,25 +3,25 @@
 {{- $apiServerAdress := index $cozyConfig.data "api-server-adress" }}
 {{- $k8sClient := randAlphaNum 32 -}}
 
-apiVersion: v1.edp.epam.com/v1
-kind: Keycloak
+apiVersion: v1.edp.epam.com/v1alpha1
+kind: ClusterKeycloak
 metadata:
   name: keycloak-cozy
+  namespace: {{ .Release.Namespace }}
 spec:
   secret: keycloak-credentials
   url: https://keycloak.{{ $host }}
 
 ---
 
-apiVersion: v1.edp.epam.com/v1
-kind: KeycloakRealm
+apiVersion: v1.edp.epam.com/v1alpha1
+kind: ClusterKeycloakRealm
 metadata:
   name: keycloakrealm-cozy
+  namespace: {{ .Release.Namespace }}
 spec:
  realmName: cozy
- keycloakRef:
-   name: keycloak-cozy
-   kind: Keycloak
+ clusterKeycloakRef: keycloak-cozy
 
 ---
 
@@ -33,7 +33,7 @@ spec:
   name: groups
   realmRef:
     name: keycloakrealm-cozy
-    kind: KeycloakRealm
+    kind: ClusterKeycloakRealm
   description: "Group Membership"
   protocol: openid-connect
   protocolMappers:
@@ -68,7 +68,7 @@ spec:
     enabled: true
   realmRef:
     name: keycloakrealm-cozy
-    kind: KeycloakRealm
+    kind: ClusterKeycloakRealm
   secret: $k8s-client:client-secret-key
   advancedProtocolMappers: true
   authorizationServicesEnabled: true

diff --git a/packages/system/keycloak-operator/values.yaml b/packages/system/keycloak-operator/values.yaml
@@ -0,0 +1,2 @@
+keycloak-operator:
+  clusterReconciliationEnabled: true
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		keycloak-operator:
		clusterReconciliationEnabled: true