Skip to content

Commit df448b9

Browse files
authored
Feature/add sso roles (#480)
<!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Updated application version from 1.5.0 to 1.6.0. - Introduced new role-based access control (RBAC) roles: view, use, admin, and super-admin, enhancing security and permissions management. - Added new Keycloak realm groups for view, use, admin, and super-admin roles, streamlining user management within the application. - Integrated `keycloak-configure` release into the deployment structure, establishing dependencies for improved configuration management. - **Bug Fixes** - Resolved versioning discrepancies in the tenant package. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
1 parent b5edaaa commit df448b9

11 files changed

Lines changed: 232 additions & 11 deletions

File tree

‎packages/apps/tenant/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ description: Separated tenant namespace
44
icon: /logos/tenant.svg
55

66
type: application
7-
version: 1.5.0
7+
version: 1.6.0
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
apiVersion: v1.edp.epam.com/v1
2+
kind: KeycloakRealmGroup
3+
metadata:
4+
name: {{ include "tenant.name" . }}-view
5+
namespace: {{ include "tenant.name" . }}
6+
spec:
7+
name: {{ include "tenant.name" . }}-view
8+
realmRef:
9+
name: keycloakrealm-cozy
10+
kind: ClusterKeycloakRealm
11+
12+
---
13+
14+
apiVersion: v1.edp.epam.com/v1
15+
kind: KeycloakRealmGroup
16+
metadata:
17+
name: {{ include "tenant.name" . }}-use
18+
namespace: {{ include "tenant.name" . }}
19+
spec:
20+
name: {{ include "tenant.name" . }}-use
21+
realmRef:
22+
name: keycloakrealm-cozy
23+
kind: ClusterKeycloakRealm
24+
25+
---
26+
27+
apiVersion: v1.edp.epam.com/v1
28+
kind: KeycloakRealmGroup
29+
metadata:
30+
name: {{ include "tenant.name" . }}-admin
31+
namespace: {{ include "tenant.name" . }}
32+
spec:
33+
name: {{ include "tenant.name" . }}-admin
34+
realmRef:
35+
name: keycloakrealm-cozy
36+
kind: ClusterKeycloakRealm
37+
38+
---
39+
40+
apiVersion: v1.edp.epam.com/v1
41+
kind: KeycloakRealmGroup
42+
metadata:
43+
name: {{ include "tenant.name" . }}-super-admin
44+
namespace: {{ include "tenant.name" . }}
45+
spec:
46+
name: {{ include "tenant.name" . }}-super-admin
47+
realmRef:
48+
name: keycloakrealm-cozy
49+
kind: ClusterKeycloakRealm

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

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,143 @@ roleRef:
8888
kind: Role
8989
name: {{ include "tenant.name" . }}
9090
apiGroup: rbac.authorization.k8s.io
91+
---
92+
kind: Role
93+
apiVersion: rbac.authorization.k8s.io/v1
94+
metadata:
95+
name: {{ include "tenant.name" . }}-view
96+
namespace: {{ include "tenant.name" . }}
97+
rules:
98+
- apiGroups: ["apps.cozystack.io"]
99+
resources: ["*"]
100+
verbs: ["get", "list", "watch"]
101+
- apiGroups: ["helm.toolkit.fluxcd.io"]
102+
resources: ["helmreleases"]
103+
verbs: ["get", "list", "watch"]
104+
- apiGroups: [""]
105+
resources: ["pods", "pods/log"]
106+
verbs: ["get", "list", "watch"]
107+
---
108+
kind: RoleBinding
109+
apiVersion: rbac.authorization.k8s.io/v1
110+
metadata:
111+
name: {{ include "tenant.name" . }}-view
112+
namespace: {{ include "tenant.name" . }}
113+
subjects:
114+
- kind: Group
115+
name: {{ include "tenant.name" . }}-view
116+
apiGroup: rbac.authorization.k8s.io
117+
roleRef:
118+
kind: Role
119+
name: {{ include "tenant.name" . }}-view
120+
apiGroup: rbac.authorization.k8s.io
121+
---
122+
kind: Role
123+
apiVersion: rbac.authorization.k8s.io/v1
124+
metadata:
125+
name: {{ include "tenant.name" . }}-use
126+
namespace: {{ include "tenant.name" . }}
127+
rules:
128+
- apiGroups: ["apps.cozystack.io"]
129+
resources: ["*"]
130+
verbs: ["get", "list", "watch"]
131+
- apiGroups: ["helm.toolkit.fluxcd.io"]
132+
resources: ["helmreleases"]
133+
verbs: ["get", "list", "watch"]
134+
- apiGroups: [""]
135+
resources: ["pods", "pods/log"]
136+
verbs: ["get", "list", "watch"]
137+
- apiGroups: ["kubevirt.io"]
138+
resources: ["virtualmachines"]
139+
verbs: ["get", "list"]
140+
- apiGroups: ["subresources.kubevirt.io"]
141+
resources: ["virtualmachineinstances/console", "virtualmachineinstances/vnc"]
142+
verbs: ["get", "list"]
143+
---
144+
kind: RoleBinding
145+
apiVersion: rbac.authorization.k8s.io/v1
146+
metadata:
147+
name: {{ include "tenant.name" . }}-use
148+
namespace: {{ include "tenant.name" . }}
149+
subjects:
150+
- kind: Group
151+
name: {{ include "tenant.name" . }}-use
152+
apiGroup: rbac.authorization.k8s.io
153+
roleRef:
154+
kind: Role
155+
name: {{ include "tenant.name" . }}-use
156+
apiGroup: rbac.authorization.k8s.io
157+
---
158+
kind: Role
159+
apiVersion: rbac.authorization.k8s.io/v1
160+
metadata:
161+
name: {{ include "tenant.name" . }}-admin
162+
namespace: {{ include "tenant.name" . }}
163+
rules:
164+
- apiGroups: ["helm.toolkit.fluxcd.io"]
165+
resources: ["helmreleases"]
166+
verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
167+
- apiGroups: [""]
168+
resources: ["pods/log", "pods"]
169+
verbs: ["get", "list", "watch", "delete"]
170+
- apiGroups: ["kubevirt.io"]
171+
resources: ["virtualmachines"]
172+
verbs: ["get", "list"]
173+
- apiGroups: ["subresources.kubevirt.io"]
174+
resources: ["virtualmachineinstances/console", "virtualmachineinstances/vnc"]
175+
verbs: ["get", "list"]
176+
- apiGroups: ["apps.cozystack.io"]
177+
resources: ["buckets", "clickhouses", "ferretdb", "foos", "httpcaches", "kafkas", "kuberneteses", "mysqls", "natses", "postgreses", "rabbitmqs", "redises", "seaweedfses", "tcpbalancers", "virtualmachines", "vmdisks", "vminstances"]
178+
verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
179+
180+
---
181+
kind: RoleBinding
182+
apiVersion: rbac.authorization.k8s.io/v1
183+
metadata:
184+
name: {{ include "tenant.name" . }}-admin
185+
namespace: {{ include "tenant.name" . }}
186+
subjects:
187+
- kind: Group
188+
name: {{ include "tenant.name" . }}-admin
189+
apiGroup: rbac.authorization.k8s.io
190+
roleRef:
191+
kind: Role
192+
name: {{ include "tenant.name" . }}-admin
193+
apiGroup: rbac.authorization.k8s.io
194+
---
195+
kind: Role
196+
apiVersion: rbac.authorization.k8s.io/v1
197+
metadata:
198+
name: {{ include "tenant.name" . }}-super-admin
199+
namespace: {{ include "tenant.name" . }}
200+
rules:
201+
- apiGroups: ["helm.toolkit.fluxcd.io"]
202+
resources: ["helmreleases"]
203+
verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
204+
- apiGroups: [""]
205+
resources: ["pods/log", "pods"]
206+
verbs: ["get", "list", "watch", "delete"]
207+
- apiGroups: ["kubevirt.io"]
208+
resources: ["virtualmachines"]
209+
verbs: ["get", "list"]
210+
- apiGroups: ["subresources.kubevirt.io"]
211+
resources: ["virtualmachineinstances/console", "virtualmachineinstances/vnc"]
212+
verbs: ["get", "list"]
213+
- apiGroups: ["apps.cozystack.io"]
214+
resources: ["*"]
215+
verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
216+
217+
---
218+
kind: RoleBinding
219+
apiVersion: rbac.authorization.k8s.io/v1
220+
metadata:
221+
name: {{ include "tenant.name" . }}-super-admin
222+
namespace: {{ include "tenant.name" . }}
223+
subjects:
224+
- kind: Group
225+
name: {{ include "tenant.name" . }}-super-admin
226+
apiGroup: rbac.authorization.k8s.io
227+
roleRef:
228+
kind: Role
229+
name: {{ include "tenant.name" . }}-super-admin
230+
apiGroup: rbac.authorization.k8s.io

‎packages/apps/versions_map‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ tenant 1.2.0 15478a88
8686
tenant 1.3.0 ceefae03
8787
tenant 1.3.1 c56e5769
8888
tenant 1.4.0 94c688f7
89-
tenant 1.5.0 HEAD
89+
tenant 1.5.0 48128743
90+
tenant 1.6.0 HEAD
9091
virtual-machine 0.1.4 f2015d6
9192
virtual-machine 0.1.5 7cd7de7
9293
virtual-machine 0.2.0 5ca8823

‎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

0 commit comments

Comments
 (0)