Skip to content

Commit 36c80ac

Browse files
authored
fix (#540)
1 parent 25c3031 commit 36c80ac

3 files changed

Lines changed: 16 additions & 32 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.6.3
7+
version: 1.6.4

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

Lines changed: 13 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ rules:
3131
- apiGroups: ["rbac.authorization.k8s.io"]
3232
resources: ["roles"]
3333
verbs: ["get"]
34-
- apiGroups: ["helm.toolkit.fluxcd.io"]
35-
resources: ["helmreleases"]
36-
verbs: ["*"]
34+
3735
---
3836
apiVersion: rbac.authorization.k8s.io/v1
3937
kind: RoleBinding
@@ -86,14 +84,6 @@ rules:
8684
- get
8785
- list
8886
- watch
89-
- apiGroups:
90-
- helm.toolkit.fluxcd.io
91-
resources:
92-
- helmreleases
93-
verbs:
94-
- get
95-
- list
96-
- watch
9787
- apiGroups:
9888
- ""
9989
resources:
@@ -122,6 +112,9 @@ subjects:
122112
name: tenant-root-view
123113
apiGroup: rbac.authorization.k8s.io
124114
{{- end }}
115+
- kind: Group
116+
name: {{ include "tenant.name" . }}-view
117+
apiGroup: rbac.authorization.k8s.io
125118
{{- if hasPrefix "tenant-" .Release.Namespace }}
126119
{{- $parts := splitList "-" .Release.Namespace }}
127120
{{- range $i, $v := $parts }}
@@ -158,13 +151,6 @@ rules:
158151
- get
159152
- list
160153
- watch
161-
- apiGroups: ["helm.toolkit.fluxcd.io"]
162-
resources:
163-
- helmreleases
164-
verbs:
165-
- get
166-
- list
167-
- watch
168154
- apiGroups: [""]
169155
resources:
170156
- "*"
@@ -198,6 +184,9 @@ subjects:
198184
name: tenant-root-use
199185
apiGroup: rbac.authorization.k8s.io
200186
{{- end }}
187+
- kind: Group
188+
name: {{ include "tenant.name" . }}-use
189+
apiGroup: rbac.authorization.k8s.io
201190
{{- if hasPrefix "tenant-" .Release.Namespace }}
202191
{{- $parts := splitList "-" .Release.Namespace }}
203192
{{- range $i, $v := $parts }}
@@ -234,13 +223,6 @@ rules:
234223
- list
235224
- watch
236225
- delete
237-
- apiGroups: ["helm.toolkit.fluxcd.io"]
238-
resources:
239-
- helmreleases
240-
verbs:
241-
- get
242-
- list
243-
- watch
244226
- apiGroups: ["kubevirt.io"]
245227
resources:
246228
- virtualmachines
@@ -293,6 +275,9 @@ subjects:
293275
name: tenant-root-admin
294276
apiGroup: rbac.authorization.k8s.io
295277
{{- end }}
278+
- kind: Group
279+
name: {{ include "tenant.name" . }}-admin
280+
apiGroup: rbac.authorization.k8s.io
296281
{{- if hasPrefix "tenant-" .Release.Namespace }}
297282
{{- $parts := splitList "-" .Release.Namespace }}
298283
{{- range $i, $v := $parts }}
@@ -329,11 +314,6 @@ rules:
329314
- list
330315
- watch
331316
- delete
332-
- apiGroups: ["helm.toolkit.fluxcd.io"]
333-
resources:
334-
- helmreleases
335-
verbs:
336-
- '*'
337317
- apiGroups: ["kubevirt.io"]
338318
resources:
339319
- virtualmachines
@@ -363,6 +343,9 @@ subjects:
363343
name: tenant-root-super-admin
364344
apiGroup: rbac.authorization.k8s.io
365345
{{- end }}
346+
- kind: Group
347+
name: {{ include "tenant.name" . }}-super-admin
348+
apiGroup: rbac.authorization.k8s.io
366349
{{- if hasPrefix "tenant-" .Release.Namespace }}
367350
{{- $parts := splitList "-" .Release.Namespace }}
368351
{{- range $i, $v := $parts }}

‎packages/apps/versions_map‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ tenant 1.5.0 48128743
9393
tenant 1.6.0 df448b99
9494
tenant 1.6.1 edbbb9be
9595
tenant 1.6.2 ccedc5fe
96-
tenant 1.6.3 HEAD
96+
tenant 1.6.3 2057bb96
97+
tenant 1.6.4 HEAD
9798
virtual-machine 0.1.4 f2015d6
9899
virtual-machine 0.1.5 7cd7de7
99100
virtual-machine 0.2.0 5ca8823

0 commit comments

Comments
 (0)