Skip to content

Commit 158a196

Browse files
committed
feat: add complete ui-operator addon with RBAC
fix: remove trailing whitespace in manifests.sls for ui-operator addon fix: remove trailing whitespace in rbac.sls for ui-operator addon refactor: update RBAC configuration for ui-operator addon to streamline permissions and remove unnecessary rules feat: add service account to ui-operator deployment for enhanced security feat: include namespace in ui-operator init.sls for improved deployment structure
1 parent 700256e commit 158a196

File tree

4 files changed

+71
-0
lines changed

4 files changed

+71
-0
lines changed

buildchain/buildchain/salt_tree.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,7 @@ def _download_ui_operator_crds() -> str:
450450
),
451451
context={"CRDs": _download_ui_operator_crds()},
452452
),
453+
Path("salt/metalk8s/addons/ui-operator/deployed/rbac.sls"),
453454
Path("salt/metalk8s/addons/ui-operator/post-upgrade.sls"),
454455
Path("salt/metalk8s/addons/solutions/deployed/configmap.sls"),
455456
Path("salt/metalk8s/addons/solutions/deployed/init.sls"),

salt/metalk8s/addons/ui-operator/deployed/init.sls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
include:
2+
- .namespace
23
- .manifests
34

45
Wait for the UI Operator to be Ready:

salt/metalk8s/addons/ui-operator/deployed/manifests.sls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Deploy UI Operator:
2727
labels:
2828
app.kubernetes.io/name: ui-operator
2929
spec:
30+
serviceAccountName: ui-operator
3031
containers:
3132
- name: ui-operator
3233
image: {{ ui_operator_image }}
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
#! metalk8s_kubernetes
2+
3+
apiVersion: v1
4+
kind: ServiceAccount
5+
metadata:
6+
name: ui-operator
7+
namespace: metalk8s-ui
8+
labels:
9+
app.kubernetes.io/name: ui-operator
10+
app.kubernetes.io/managed-by: salt
11+
app.kubernetes.io/part-of: metalk8s
12+
heritage: metalk8s
13+
automountServiceAccountToken: true
14+
15+
---
16+
apiVersion: rbac.authorization.k8s.io/v1
17+
kind: ClusterRole
18+
metadata:
19+
name: ui-operator
20+
labels:
21+
app.kubernetes.io/name: ui-operator
22+
app.kubernetes.io/managed-by: salt
23+
app.kubernetes.io/part-of: metalk8s
24+
heritage: metalk8s
25+
rules:
26+
- apiGroups: [""]
27+
resources: ["configmaps", "services"]
28+
verbs: ["create", "delete", "get", "list", "patch", "update", "watch"]
29+
- apiGroups: [""]
30+
resources: ["events"]
31+
verbs: ["create", "patch"]
32+
- apiGroups: [""]
33+
resources: ["nodes"]
34+
verbs: ["get", "list", "watch"]
35+
- apiGroups: ["apps"]
36+
resources: ["deployments"]
37+
verbs: ["create", "delete", "get", "list", "patch", "update", "watch"]
38+
- apiGroups: ["networking.k8s.io"]
39+
resources: ["ingresses"]
40+
verbs: ["create", "delete", "get", "list", "patch", "update", "watch"]
41+
- apiGroups: ["ui.scality.com"]
42+
resources: ["scalityuicomponentexposers", "scalityuicomponents", "scalityuis"]
43+
verbs: ["create", "delete", "get", "list", "patch", "update", "watch"]
44+
- apiGroups: ["ui.scality.com"]
45+
resources: ["scalityuicomponentexposers/finalizers", "scalityuicomponents/finalizers", "scalityuis/finalizers"]
46+
verbs: ["update"]
47+
- apiGroups: ["ui.scality.com"]
48+
resources: ["scalityuicomponentexposers/status", "scalityuicomponents/status", "scalityuis/status"]
49+
verbs: ["get", "patch", "update"]
50+
51+
---
52+
apiVersion: rbac.authorization.k8s.io/v1
53+
kind: ClusterRoleBinding
54+
metadata:
55+
name: ui-operator
56+
labels:
57+
app.kubernetes.io/name: ui-operator
58+
app.kubernetes.io/managed-by: salt
59+
app.kubernetes.io/part-of: metalk8s
60+
heritage: metalk8s
61+
roleRef:
62+
apiGroup: rbac.authorization.k8s.io
63+
kind: ClusterRole
64+
name: ui-operator
65+
subjects:
66+
- kind: ServiceAccount
67+
name: ui-operator
68+
namespace: metalk8s-ui

0 commit comments

Comments
 (0)