Skip to content

Commit f02bbf0

Browse files
committed
fix configure and add KeycloakRealmGroup
1 parent 4f58d24 commit f02bbf0

8 files changed

Lines changed: 48 additions & 13 deletions

File tree

‎packages/apps/tenant/templates/keycloakgroups.yaml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,48 @@ apiVersion: v1.edp.epam.com/v1
22
kind: KeycloakRealmGroup
33
metadata:
44
name: {{ include "tenant.name" . }}-view
5+
namespace: {{ include "tenant.name" . }}
56
spec:
67
name: {{ include "tenant.name" . }}-view
78
realmRef:
89
name: keycloakrealm-cozy
9-
kind: KeycloakRealm
10+
kind: ClusterKeycloakRealm
1011

1112
---
1213

1314
apiVersion: v1.edp.epam.com/v1
1415
kind: KeycloakRealmGroup
1516
metadata:
1617
name: {{ include "tenant.name" . }}-use
18+
namespace: {{ include "tenant.name" . }}
1719
spec:
1820
name: {{ include "tenant.name" . }}-use
1921
realmRef:
2022
name: keycloakrealm-cozy
21-
kind: KeycloakRealm
23+
kind: ClusterKeycloakRealm
2224

2325
---
2426

2527
apiVersion: v1.edp.epam.com/v1
2628
kind: KeycloakRealmGroup
2729
metadata:
2830
name: {{ include "tenant.name" . }}-admin
31+
namespace: {{ include "tenant.name" . }}
2932
spec:
3033
name: {{ include "tenant.name" . }}-admin
3134
realmRef:
3235
name: keycloakrealm-cozy
33-
kind: KeycloakRealm
36+
kind: ClusterKeycloakRealm
3437

3538
---
3639

3740
apiVersion: v1.edp.epam.com/v1
3841
kind: KeycloakRealmGroup
3942
metadata:
4043
name: {{ include "tenant.name" . }}-super-admin
44+
namespace: {{ include "tenant.name" . }}
4145
spec:
4246
name: {{ include "tenant.name" . }}-super-admin
4347
realmRef:
4448
name: keycloakrealm-cozy
45-
kind: KeycloakRealm
49+
kind: ClusterKeycloakRealm

‎packages/core/platform/bundles/distro-full.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,3 +188,10 @@ releases:
188188
namespace: cozy-keycloak
189189
optional: true
190190
dependsOn: [keycloak]
191+
192+
- name: keycloak-configure
193+
releaseName: keycloak-configure
194+
chart: cozy-keycloak-configure
195+
namespace: cozy-keycloak
196+
optional: true
197+
dependsOn: [keycloak-operator]

‎packages/core/platform/bundles/distro-hosted.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,3 +138,10 @@ releases:
138138
namespace: cozy-keycloak
139139
optional: true
140140
dependsOn: [keycloak]
141+
142+
- name: keycloak-configure
143+
releaseName: keycloak-configure
144+
chart: cozy-keycloak-configure
145+
namespace: cozy-keycloak
146+
optional: true
147+
dependsOn: [keycloak-operator]

‎packages/core/platform/bundles/paas-full.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,3 +261,9 @@ releases:
261261
chart: cozy-keycloak-operator
262262
namespace: cozy-keycloak
263263
dependsOn: [keycloak]
264+
265+
- name: keycloak-configure
266+
releaseName: keycloak-configure
267+
chart: cozy-keycloak-configure
268+
namespace: cozy-keycloak
269+
dependsOn: [keycloak-operator]

‎packages/core/platform/bundles/paas-hosted.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,3 +157,9 @@ releases:
157157
chart: cozy-keycloak-operator
158158
namespace: cozy-keycloak
159159
dependsOn: [keycloak]
160+
161+
- name: keycloak-configure
162+
releaseName: keycloak-configure
163+
chart: cozy-keycloak-configure
164+
namespace: cozy-keycloak
165+
dependsOn: [keycloak-operator]
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
apiVersion: v2
2+
name: cozy-keycloak-configure
3+
version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process

packages/system/keycloak-operator/templates/configure-kk.yaml renamed to packages/system/keycloak-configure/templates/configure-kk.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
{{- $apiServerAdress := index $cozyConfig.data "api-server-adress" }}
44
{{- $k8sClient := randAlphaNum 32 -}}
55

6-
apiVersion: v1.edp.epam.com/v1
7-
kind: Keycloak
6+
apiVersion: v1.edp.epam.com/v1alpha1
7+
kind: ClusterKeycloak
88
metadata:
99
name: keycloak-cozy
10+
namespace: {{ .Release.Namespace }}
1011
spec:
1112
secret: keycloak-credentials
1213
url: https://keycloak.{{ $host }}
1314

1415
---
1516

16-
apiVersion: v1.edp.epam.com/v1
17-
kind: KeycloakRealm
17+
apiVersion: v1.edp.epam.com/v1alpha1
18+
kind: ClusterKeycloakRealm
1819
metadata:
1920
name: keycloakrealm-cozy
21+
namespace: {{ .Release.Namespace }}
2022
spec:
2123
realmName: cozy
22-
keycloakRef:
23-
name: keycloak-cozy
24-
kind: Keycloak
24+
clusterKeycloakRef: keycloak-cozy
2525

2626
---
2727

@@ -33,7 +33,7 @@ spec:
3333
name: groups
3434
realmRef:
3535
name: keycloakrealm-cozy
36-
kind: KeycloakRealm
36+
kind: ClusterKeycloakRealm
3737
description: "Group Membership"
3838
protocol: openid-connect
3939
protocolMappers:
@@ -68,7 +68,7 @@ spec:
6868
enabled: true
6969
realmRef:
7070
name: keycloakrealm-cozy
71-
kind: KeycloakRealm
71+
kind: ClusterKeycloakRealm
7272
secret: $k8s-client:client-secret-key
7373
advancedProtocolMappers: true
7474
authorizationServicesEnabled: true
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
keycloak-operator:
2+
clusterReconciliationEnabled: true

0 commit comments

Comments
 (0)