Skip to content

Commit e8336cc

Browse files
committed
Bump CSI External Components to v0.3.0+ and turn on kubelet registration
1 parent 5181cdc commit e8336cc

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ gce-pd-driver:
2828
go build -ldflags "-X main.vendorVersion=${STAGINGVERSION}" -o bin/gce-pd-csi-driver ./cmd/
2929

3030
build-container:
31-
ifndef GCE_PD_CSI_STAGING_IMAGE
32-
$(error "Must set environment variable GCE_PD_CSI_STAGING_IMAGE to staging image repository")
33-
endif
31+
ifndef GCE_PD_CSI_STAGING_IMAGE
32+
$(error "Must set environment variable GCE_PD_CSI_STAGING_IMAGE to staging image repository")
33+
endif
3434
docker build --build-arg TAG=$(STAGINGVERSION) -t $(STAGINGIMAGE):$(STAGINGVERSION) .
3535

3636
push-container: build-container

deploy/kubernetes/dev/controller.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ spec:
1717
containers:
1818
- name: csi-provisioner
1919
imagePullPolicy: Always
20-
image: quay.io/k8scsi/csi-provisioner:v0.2.0
20+
image: quay.io/k8scsi/csi-provisioner:v0.3.1
2121
args:
2222
- "--v=5"
23-
- "--provisioner=csi-gce-pd"
23+
- "--provisioner=com.google.csi.gcepd"
2424
- "--csi-address=$(ADDRESS)"
2525
env:
2626
- name: ADDRESS
@@ -30,7 +30,7 @@ spec:
3030
mountPath: /csi
3131
- name: csi-attacher
3232
imagePullPolicy: Always
33-
image: quay.io/k8scsi/csi-attacher:v0.2.0
33+
image: quay.io/k8scsi/csi-attacher:v0.3.0
3434
args:
3535
- "--v=5"
3636
- "--csi-address=$(ADDRESS)"

deploy/kubernetes/dev/node.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,23 @@ spec:
1616
containers:
1717
- name: csi-driver-registrar
1818
imagePullPolicy: Always
19-
image: quay.io/k8scsi/driver-registrar:v0.2.0
19+
image: quay.io/k8scsi/driver-registrar:v0.3.0
2020
args:
2121
- "--v=5"
2222
- "--csi-address=$(ADDRESS)"
23+
- "--kubelet-registration-path=/var/lib/kubelet/plugins/com.google.csi.gcepd/csi.sock"
2324
env:
2425
- name: ADDRESS
25-
value: /csi/csi.sock
26+
value: /var/lib/kubelet/plugins/com.google.csi.gcepd/csi.sock
2627
- name: KUBE_NODE_NAME
2728
valueFrom:
2829
fieldRef:
2930
fieldPath: spec.nodeName
3031
volumeMounts:
3132
- name: plugin-dir
32-
mountPath: /csi
33-
# - name: registrar-socket-dir
34-
# mountPath: /var/lib/csi/sockets/
33+
mountPath: /var/lib/kubelet/plugins/com.google.csi.gcepd/
34+
- name: registration-dir
35+
mountPath: /registration
3536
- name: gce-pd-driver
3637
securityContext:
3738
privileged: true
@@ -52,11 +53,10 @@ spec:
5253
- name: device-dir
5354
mountPath: /host/dev
5455
volumes:
55-
# TODO(#92): this will work when kublet registrar functionality exists
56-
#- name: registrar-socket-dir
57-
# hostPath:
58-
# path: /var/lib/kubelet/device-plugins/
59-
# type: DirectoryOrCreate
56+
- name: registration-dir
57+
hostPath:
58+
path: /var/lib/kubelet/plugins/
59+
type: Directory
6060
- name: kubelet-dir
6161
hostPath:
6262
path: /var/lib/kubelet

examples/kubernetes/demo-regional-sc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: storage.k8s.io/v1beta1
22
kind: StorageClass
33
metadata:
44
name: csi-gce-pd
5-
provisioner: csi-gce-pd
5+
provisioner: com.google.csi.gcepd
66
parameters:
77
type: pd-standard
88
replication-type: regional-pd

examples/kubernetes/demo-zonal-sc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: storage.k8s.io/v1beta1
22
kind: StorageClass
33
metadata:
44
name: csi-gce-pd
5-
provisioner: csi-gce-pd
5+
provisioner: com.google.csi.gcepd
66
parameters:
77
type: pd-standard
88
volumeBindingMode: Immediate

0 commit comments

Comments
 (0)