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

Bump CSI External Components to v0.3.0+ and turn on Kubelet Registration #119

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ gce-pd-driver:
go build -ldflags "-X main.vendorVersion=${STAGINGVERSION}" -o bin/gce-pd-csi-driver ./cmd/

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

push-container: build-container
Expand Down
6 changes: 3 additions & 3 deletions deploy/kubernetes/dev/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ spec:
containers:
- name: csi-provisioner
imagePullPolicy: Always
image: quay.io/k8scsi/csi-provisioner:v0.2.0
image: quay.io/k8scsi/csi-provisioner:v0.3.1
args:
- "--v=5"
- "--provisioner=csi-gce-pd"
- "--provisioner=com.google.csi.gcepd"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you don't need to set provisioner name

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

- "--csi-address=$(ADDRESS)"
env:
- name: ADDRESS
Expand All @@ -30,7 +30,7 @@ spec:
mountPath: /csi
- name: csi-attacher
imagePullPolicy: Always
image: quay.io/k8scsi/csi-attacher:v0.2.0
image: quay.io/k8scsi/csi-attacher:v0.3.0
args:
- "--v=5"
- "--csi-address=$(ADDRESS)"
Expand Down
20 changes: 10 additions & 10 deletions deploy/kubernetes/dev/node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,23 @@ spec:
containers:
- name: csi-driver-registrar
imagePullPolicy: Always
image: quay.io/k8scsi/driver-registrar:v0.2.0
image: quay.io/k8scsi/driver-registrar:v0.3.0
args:
- "--v=5"
- "--csi-address=$(ADDRESS)"
- "--kubelet-registration-path=/var/lib/kubelet/plugins/com.google.csi.gcepd/csi.sock"
env:
- name: ADDRESS
value: /csi/csi.sock
value: /var/lib/kubelet/plugins/com.google.csi.gcepd/csi.sock
- name: KUBE_NODE_NAME
valueFrom:
fieldRef:
fieldPath: spec.nodeName
volumeMounts:
- name: plugin-dir
mountPath: /csi
# - name: registrar-socket-dir
# mountPath: /var/lib/csi/sockets/
mountPath: /var/lib/kubelet/plugins/com.google.csi.gcepd/
- name: registration-dir
mountPath: /registration
- name: gce-pd-driver
securityContext:
privileged: true
Expand All @@ -52,11 +53,10 @@ spec:
- name: device-dir
mountPath: /host/dev
volumes:
# TODO(#92): this will work when kublet registrar functionality exists
#- name: registrar-socket-dir
# hostPath:
# path: /var/lib/kubelet/device-plugins/
# type: DirectoryOrCreate
- name: registration-dir
hostPath:
path: /var/lib/kubelet/plugins/
type: Directory
- name: kubelet-dir
hostPath:
path: /var/lib/kubelet
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/demo-regional-sc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: storage.k8s.io/v1beta1
kind: StorageClass
metadata:
name: csi-gce-pd
provisioner: csi-gce-pd
provisioner: com.google.csi.gcepd
parameters:
type: pd-standard
replication-type: regional-pd
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/demo-zonal-sc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: storage.k8s.io/v1beta1
kind: StorageClass
metadata:
name: csi-gce-pd
provisioner: csi-gce-pd
provisioner: com.google.csi.gcepd
parameters:
type: pd-standard
volumeBindingMode: Immediate