Skip to content

Commit 5fd8c54

Browse files
committed
Enable topology in dev and staging
1 parent b48a7de commit 5fd8c54

File tree

7 files changed

+31
-13
lines changed

7 files changed

+31
-13
lines changed

deploy/kubernetes/base/controller.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ spec:
2020
args:
2121
- "--v=5"
2222
- "--csi-address=/csi/csi.sock"
23+
- "--feature-gates=Topology=true"
2324
volumeMounts:
2425
- name: socket-dir
2526
mountPath: /csi

deploy/kubernetes/base/setup-cluster.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ rules:
5757
- apiGroups: ["storage.k8s.io"]
5858
resources: ["storageclasses"]
5959
verbs: ["get", "list", "watch"]
60+
- apiGroups: ["storage.k8s.io"]
61+
resources: ["csinodes"]
62+
verbs: ["get", "list", "watch"]
6063
- apiGroups: [""]
6164
resources: ["events"]
6265
verbs: ["list", "watch", "create", "update", "patch"]
@@ -159,4 +162,4 @@ subjects:
159162
roleRef:
160163
kind: ClusterRole
161164
name: external-snapshotter-role
162-
apiGroup: rbac.authorization.k8s.io
165+
apiGroup: rbac.authorization.k8s.io

deploy/kubernetes/overlays/dev/kustomization.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ images:
1212
newName: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver
1313
newTag: "v0.4.0-gke.0"
1414
- name: REPLACEME/csi-provisioner
15-
newName: gcr.io/gke-release/csi-provisioner
16-
newTag: "v1.0.1-gke.0"
15+
newName: quay.io/k8scsi/csi-provisioner
16+
newTag: "v1.1.0"
1717
- name: REPLACEME/csi-attacher
18-
newName: gcr.io/gke-release/csi-attacher
19-
newTag: "v1.0.1-gke.0"
18+
newName: quay.io/k8scsi/csi-attacher
19+
newTag: "v1.1.0"
2020
- name: REPLACEME/csi-node-driver-registrar
21-
newName: gcr.io/gke-release/csi-node-driver-registrar
22-
newTag: "v1.0.1-gke.0"
21+
newName: quay.io/k8scsi/csi-node-driver-registrar
22+
newTag: "v1.1.0"

deploy/kubernetes/overlays/prow-gke-staging/kustomization.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ images:
88
newTag: "v0.4.0-gke.0"
99
- name: REPLACEME/csi-provisioner
1010
newName: gcr.io/gke-release-staging/csi-provisioner
11-
newTag: "v1.0.1-gke.0"
11+
newTag: "v1.1.0-gke.0"
1212
- name: REPLACEME/csi-attacher
1313
newName: gcr.io/gke-release-staging/csi-attacher
14-
newTag: "v1.0.1-gke.0"
14+
newTag: "v1.1.0-gke.0"
1515
- name: REPLACEME/csi-node-driver-registrar
1616
newName: gcr.io/gke-release-staging/csi-node-driver-registrar
17-
newTag: "v1.0.1-gke.0"
17+
newTag: "v1.1.0-gke.0"

deploy/kubernetes/overlays/prow-pull/kustomization.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ images:
88
newTag: "v0.4.0-gke.0"
99
- name: REPLACEME/csi-provisioner
1010
newName: quay.io/k8scsi/csi-provisioner
11-
newTag: "v1.0.1"
11+
newTag: "v1.1.0"
1212
- name: REPLACEME/csi-attacher
1313
newName: quay.io/k8scsi/csi-attacher
14-
newTag: "v1.0.1"
14+
newTag: "v1.1.0"
1515
- name: REPLACEME/csi-node-driver-registrar
1616
newName: quay.io/k8scsi/csi-node-driver-registrar
17-
newTag: "v1.0.1"
17+
newTag: "v1.1.0"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
kind: StatefulSet
2+
apiVersion: apps/v1
3+
metadata:
4+
name: csi-gce-pd-controller
5+
spec:
6+
template:
7+
spec:
8+
containers:
9+
- name: csi-provisioner
10+
args:
11+
- "--v=5"
12+
- "--csi-address=$(ADDRESS)"

deploy/kubernetes/overlays/stable/kustomization.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
bases:
44
- ../../base
5+
patches:
6+
- controller_disable_topology.yaml
57
images:
68
- name: REPLACEME/gcp-compute-persistent-disk-csi-driver
79
newName: gcr.io/gke-release/csi/gce-pd-driver

0 commit comments

Comments
 (0)