Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove cluster-admin role #615

Draft
wants to merge 14 commits into
base: master
Choose a base branch
from
1 change: 0 additions & 1 deletion charts/virtual-kubelet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,3 @@ The following table lists the configurable parameters of the azure-aci chart and
| rbac.install | Install Default RBAC roles and bindings. | `true` |
| rbac.serviceAccountName | RBAC service account name. | `virtual-kubelet-helm` |
| rbac.apiVersion | RBAC api version. | `v1` |
| rbac.roleRef | Cluster role reference. | `cluster-admin` |
24 changes: 24 additions & 0 deletions charts/virtual-kubelet/templates/clusterrole.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
apiVersion: "rbac.authorization.k8s.io/{{ .Values.rbac.apiVersion }}"
kind: ClusterRole
metadata:
name: {{ include "vk.fullname" . }}-clusterrole
{{ include "vk.labels" . | indent 2 }}
rules:
- apiGroups: [""]
resources: ["pods"]
verbs: ["get", "list", "watch", "create", "delete", "update", "patch"]
- apiGroups: [""]
resources: ["nodes"]
verbs: ["get", "list", "watch", "create", "update", "patch"]
- apiGroups: [""]
resources: ["pods/status", "nodes/status"]
verbs: ["get", "list", "watch", "update", "patch"]
- apiGroups: [""]
resources: ["persistentvolumes", "persistentvolumeclaims", "replicationcontrollers", "namespaces", "configmaps", "secrets", "services"]
verbs: ["get", "list", "watch"]
- apiGroups: ["apps"]
resources: ["deployments"]
verbs: ["get","list","watch","create", "delete", "update", "patch"]
- apiGroups: ["coordination.k8s.io"]
resources: ["leases"]
verbs: ["get", "create", "update"]
8 changes: 4 additions & 4 deletions charts/virtual-kubelet/templates/clusterrolebinding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ metadata:
name: {{ template "vk.fullname" . }}-{{ .Values.rbac.serviceAccountName }}
{{ include "vk.labels" . | indent 2 }}
subjects:
- kind: ServiceAccount
name: {{ template "vk.fullname" . }}-{{ .Values.rbac.serviceAccountName }}
namespace: {{ .Values.namespace }}
- kind: ServiceAccount
name: {{ template "vk.fullname" . }}-{{ .Values.rbac.serviceAccountName }}
namespace: {{ .Values.namespace }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: {{ .Values.rbac.roleRef }}
name: {{ include "vk.fullname" . }}-clusterrole
{{ end }}
2 changes: 0 additions & 2 deletions charts/virtual-kubelet/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,3 @@ rbac:
serviceAccountName: virtual-kubelet-helm
## RBAC api version
apiVersion: v1
## Cluster role reference
roleRef: cluster-admin
4 changes: 2 additions & 2 deletions hack/e2e/aks-addon.sh
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ az aks create \
-g "$RESOURCE_GROUP" \
-l "$LOCATION" \
-c "$NODE_COUNT" \
--node-vm-size standard_d8_v3 \
--node-vm-size standard_d8s_v3 \
-n "$CLUSTER_NAME" \
--network-plugin azure \
--vnet-subnet-id "$cluster_subnet_id" \
Expand All @@ -128,7 +128,7 @@ az aks create \
-g "$RESOURCE_GROUP" \
-l "$LOCATION" \
-c "$NODE_COUNT" \
--node-vm-size standard_d8_v3 \
--node-vm-size standard_d8s_v3 \
-n "$CLUSTER_NAME" \
--network-plugin azure \
--vnet-subnet-id "$cluster_subnet_id" \
Expand Down
Loading