Skip to content

Commit 5e9eb78

Browse files
authored
Adds default role-bindings for the admin user (#685)
* Adds default role-bindings for the admin user - Can be disabled if need be - Improves the UX a lot, user doesn't have to fiddle with rolebindings during setup * Clean up apparently unused bindings
1 parent 7e452cd commit 5e9eb78

File tree

3 files changed

+72
-22
lines changed

3 files changed

+72
-22
lines changed
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
{{- if .Values.rbac.adminUserRoleBindings.create -}}
2+
apiVersion: rbac.authorization.k8s.io/v1
3+
kind: RoleBinding
4+
metadata:
5+
name: wego-admin-read-apps
6+
namespace: flux-system
7+
subjects:
8+
- kind: User
9+
name: "wego-admin"
10+
apiGroup: rbac.authorization.k8s.io
11+
roleRef:
12+
kind: ClusterRole
13+
name: gitops-apps-reader
14+
apiGroup: rbac.authorization.k8s.io
15+
---
16+
apiVersion: rbac.authorization.k8s.io/v1
17+
kind: RoleBinding
18+
metadata:
19+
name: wego-admin-read-templates
20+
namespace: {{ .Values.config.capi.templates.namespace }}
21+
subjects:
22+
- kind: User
23+
name: "wego-admin"
24+
apiGroup: rbac.authorization.k8s.io
25+
roleRef:
26+
kind: ClusterRole
27+
name: gitops-templates-reader
28+
apiGroup: rbac.authorization.k8s.io
29+
---
30+
apiVersion: rbac.authorization.k8s.io/v1
31+
kind: RoleBinding
32+
metadata:
33+
name: wego-admin-read-secrets
34+
namespace: {{ .Values.config.capi.clusters.namespace }}
35+
subjects:
36+
- kind: User
37+
name: "wego-admin"
38+
apiGroup: rbac.authorization.k8s.io
39+
roleRef:
40+
kind: ClusterRole
41+
name: gitops-secrets-reader
42+
apiGroup: rbac.authorization.k8s.io
43+
---
44+
apiVersion: rbac.authorization.k8s.io/v1
45+
kind: ClusterRoleBinding
46+
metadata:
47+
name: wego-admin-read-identities
48+
subjects:
49+
- kind: User
50+
name: "wego-admin"
51+
apiGroup: rbac.authorization.k8s.io
52+
roleRef:
53+
kind: ClusterRole
54+
name: gitops-identities-reader
55+
apiGroup: rbac.authorization.k8s.io
56+
---
57+
apiVersion: rbac.authorization.k8s.io/v1
58+
kind: ClusterRoleBinding
59+
metadata:
60+
name: wego-admin-read-policies
61+
subjects:
62+
- kind: User
63+
name: "wego-admin"
64+
apiGroup: rbac.authorization.k8s.io
65+
roleRef:
66+
kind: ClusterRole
67+
name: gitops-policies-reader
68+
apiGroup: rbac.authorization.k8s.io
69+
{{- end }}

charts/mccp/values.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ clusterBootstrapController:
8484
rbac:
8585
userRoles:
8686
create: true
87+
adminUserRoleBindings:
88+
create: true
8789

8890
service:
8991
type: ClusterIP
@@ -104,4 +106,4 @@ service:
104106
healthCheckNodePort: 0
105107

106108
cluster-controller:
107-
enabled: false
109+
enabled: false

test/utils/data/rbac-auth.yaml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ metadata:
55
name: read-templates
66
namespace: default
77
subjects:
8-
- kind: User
9-
name: "wego-admin"
10-
apiGroup: rbac.authorization.k8s.io
118
- kind: User
129
1310
apiGroup: rbac.authorization.k8s.io
@@ -22,9 +19,6 @@ metadata:
2219
name: read-sources
2320
namespace: flux-system
2421
subjects:
25-
- kind: User
26-
name: "wego-admin"
27-
apiGroup: rbac.authorization.k8s.io
2822
- kind: User
2923
3024
apiGroup: rbac.authorization.k8s.io
@@ -39,9 +33,6 @@ metadata:
3933
name: read-apps
4034
namespace: flux-system
4135
subjects:
42-
- kind: User
43-
name: "wego-admin"
44-
apiGroup: rbac.authorization.k8s.io
4536
- kind: User
4637
4738
apiGroup: rbac.authorization.k8s.io
@@ -56,9 +47,6 @@ metadata:
5647
name: read-configmaps
5748
namespace: flux-system
5849
subjects:
59-
- kind: User
60-
name: wego-admin
61-
apiGroup: rbac.authorization.k8s.io
6250
- kind: User
6351
6452
apiGroup: rbac.authorization.k8s.io
@@ -73,9 +61,6 @@ kind: ClusterRoleBinding
7361
metadata:
7462
name: read-identities
7563
subjects:
76-
- kind: User
77-
name: "wego-admin"
78-
apiGroup: rbac.authorization.k8s.io
7964
- kind: User
8065
8166
apiGroup: rbac.authorization.k8s.io
@@ -89,9 +74,6 @@ kind: ClusterRoleBinding
8974
metadata:
9075
name: read-secrets
9176
subjects:
92-
- kind: User
93-
name: "wego-admin"
94-
apiGroup: rbac.authorization.k8s.io
9577
- kind: User
9678
9779
apiGroup: rbac.authorization.k8s.io
@@ -105,9 +87,6 @@ kind: ClusterRoleBinding
10587
metadata:
10688
name: read-policies
10789
subjects:
108-
- kind: User
109-
name: "wego-admin"
110-
apiGroup: rbac.authorization.k8s.io
11190
- kind: User
11291
11392
apiGroup: rbac.authorization.k8s.io

0 commit comments

Comments
 (0)