Skip to content

Prefix object names to disambiguate with other CSI drivers #405

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

Merged
merged 1 commit into from
Oct 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deploy/kubernetes/base/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ spec:
labels:
app: gcp-compute-persistent-disk-csi-driver
spec:
serviceAccountName: csi-controller-sa
priorityClassName: gce-pd-csi-driver-controller
serviceAccountName: csi-gce-pd-controller-sa
priorityClassName: csi-gce-pd-controller
containers:
- name: csi-provisioner
image: gke.gcr.io/csi-provisioner
Expand Down
4 changes: 2 additions & 2 deletions deploy/kubernetes/base/node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ spec:
labels:
app: gcp-compute-persistent-disk-csi-driver
spec:
priorityClassName: gce-pd-csi-driver-node
serviceAccountName: csi-node-sa
priorityClassName: csi-gce-pd-node
serviceAccountName: csi-gce-pd-node-sa
containers:
- name: csi-driver-registrar
image: gke.gcr.io/csi-node-driver-registrar
Expand Down
24 changes: 12 additions & 12 deletions deploy/kubernetes/base/setup-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: csi-node-sa
name: csi-gce-pd-node-sa

---
##### Controller Service Account, Roles, Rolebindings
apiVersion: v1
kind: ServiceAccount
metadata:
name: csi-controller-sa
name: csi-gce-pd-controller-sa

---
# xref: https://github.com/kubernetes-csi/external-provisioner/blob/master/deploy/kubernetes/rbac.yaml
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: external-provisioner-role
name: csi-gce-pd-provisioner-role
rules:
- apiGroups: [""]
resources: ["persistentvolumes"]
Expand All @@ -42,21 +42,21 @@ rules:
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: csi-controller-provisioner-binding
name: csi-gce-pd-controller-provisioner-binding
subjects:
- kind: ServiceAccount
name: csi-controller-sa
name: csi-gce-pd-controller-sa
roleRef:
kind: ClusterRole
name: external-provisioner-role
name: csi-gce-pd-provisioner-role
apiGroup: rbac.authorization.k8s.io

---
# xref: https://github.com/kubernetes-csi/external-attacher/blob/master/deploy/kubernetes/rbac.yaml
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: external-attacher-role
name: csi-gce-pd-attacher-role
rules:
- apiGroups: [""]
resources: ["persistentvolumes"]
Expand All @@ -76,21 +76,21 @@ rules:
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: csi-controller-attacher-binding
name: csi-gce-pd-controller-attacher-binding
subjects:
- kind: ServiceAccount
name: csi-controller-sa
name: csi-gce-pd-controller-sa
roleRef:
kind: ClusterRole
name: external-attacher-role
name: csi-gce-pd-attacher-role
apiGroup: rbac.authorization.k8s.io

---

apiVersion: scheduling.k8s.io/v1
kind: PriorityClass
metadata:
name: gce-pd-csi-driver-controller
name: csi-gce-pd-controller
value: 900000000
globalDefault: false
description: "This priority class should be used for the GCE PD CSI driver controller deployment only."
Expand All @@ -100,7 +100,7 @@ description: "This priority class should be used for the GCE PD CSI driver contr
apiVersion: scheduling.k8s.io/v1
kind: PriorityClass
metadata:
name: gce-pd-csi-driver-node
name: csi-gce-pd-node
value: 900001000
globalDefault: false
description: "This priority class should be used for the GCE PD CSI driver node deployment only."
2 changes: 1 addition & 1 deletion deploy/kubernetes/overlays/alpha/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ patchesJson6902:
group: rbac.authorization.k8s.io
version: v1
kind: ClusterRole
name: external-provisioner-role
name: csi-gce-pd-provisioner-role
path: rbac_add_snapshots_to_provisioner.yaml
resources:
- rbac_add_snapshotter.yaml
Expand Down
8 changes: 4 additions & 4 deletions deploy/kubernetes/overlays/alpha/rbac_add_resizer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: external-resizer-role
name: csi-gce-pd-resizer-role
rules:
- apiGroups: [""]
resources: ["persistentvolumes"]
Expand All @@ -21,11 +21,11 @@ rules:
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: csi-controller-resizer-binding
name: csi-gce-pd-controller-resizer-binding
subjects:
- kind: ServiceAccount
name: csi-controller-sa
name: csi-gce-pd-controller-sa
roleRef:
kind: ClusterRole
name: external-resizer-role
name: csi-gce-pd-resizer-role
apiGroup: rbac.authorization.k8s.io
8 changes: 4 additions & 4 deletions deploy/kubernetes/overlays/alpha/rbac_add_snapshotter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: external-snapshotter-role
name: csi-gce-pd-snapshotter-role
rules:
- apiGroups: [""]
resources: ["persistentvolumes"]
Expand Down Expand Up @@ -38,11 +38,11 @@ rules:
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: csi-controller-snapshotter-binding
name: csi-gce-pd-controller-snapshotter-binding
subjects:
- kind: ServiceAccount
name: csi-controller-sa
name: csi-gce-pd-controller-sa
roleRef:
kind: ClusterRole
name: external-snapshotter-role
name: csi-gce-pd-snapshotter-role
apiGroup: rbac.authorization.k8s.io