Skip to content

Commit a43e724

Browse files
committed
modify wargames role so user can access warnet dashboard
1 parent 80f467d commit a43e724

File tree

3 files changed

+24
-7
lines changed

3 files changed

+24
-7
lines changed
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{{- range .Values.roles }}
22
---
33
apiVersion: rbac.authorization.k8s.io/v1
4-
kind: Role
4+
kind: ClusterRole
55
metadata:
66
name: {{ .name }}
7-
namespace: {{ $.Values.namespaceName | default $.Release.Name }}
87
rules:
98
{{ toYaml .rules | indent 2 }}
109
{{- end }}
Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
{{- range $user := .Values.users }}
2-
{{- range $role := $user.roles }}
2+
{{- range $roleName := $user.roles }}
3+
{{- range $r := $.Values.roles }}
4+
{{- if eq $r.name $roleName }}
35
---
46
apiVersion: rbac.authorization.k8s.io/v1
57
kind: RoleBinding
68
metadata:
7-
name: {{ $.Release.Name }}-{{ $role }}-{{ $user.name }}
8-
namespace: {{ $.Values.namespaceName | default $.Release.Name }}
9+
name: {{ $.Release.Name }}-{{ $roleName }}-{{ $user.name }}
10+
namespace: {{ $r.namespaceName | default $.Values.namespaceName | default $.Release.Name }}
911
subjects:
1012
- kind: ServiceAccount
1113
name: {{ $user.name }}
1214
namespace: {{ $.Values.namespaceName | default $.Release.Name }}
1315
roleRef:
14-
kind: Role
15-
name: {{ $role }}
16+
kind: ClusterRole
17+
name: {{ $roleName }}
1618
apiGroup: rbac.authorization.k8s.io
1719
{{- end }}
1820
{{- end }}
21+
{{- end }}
22+
{{- end }}

resources/charts/namespaces/values.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ users:
33
roles:
44
- pod-viewer
55
- pod-manager
6+
- ingress-viewer
7+
- ingress-controller-viewer
68
roles:
79
- name: pod-viewer
810
rules:
@@ -44,3 +46,15 @@ roles:
4446
- apiGroups: [""]
4547
resources: ["events", "pods/status"]
4648
verbs: ["get"]
49+
- name: ingress-viewer
50+
namespaceName: ingress
51+
rules:
52+
- apiGroups: [""]
53+
resources: ["pods"]
54+
verbs: ["list", "get", "watch"]
55+
- name: ingress-controller-viewer
56+
namespaceName: warnet-logging
57+
rules:
58+
- apiGroups: ["networking.k8s.io"]
59+
resources: ["ingresses"]
60+
verbs: ["list", "get", "watch"]

0 commit comments

Comments
 (0)