Skip to content

Commit 3fbde8d

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #126 from davidz627/feature/betaDriver
Promote driver version to v0.2.0.beta
2 parents 7eee10d + 8dfed8f commit 3fbde8d

File tree

6 files changed

+52
-40
lines changed

6 files changed

+52
-40
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ STAGINGIMAGE=${GCE_PD_CSI_STAGING_IMAGE}
1919
STAGINGVERSION=${GCE_PD_CSI_STAGING_VERSION}
2020

2121
PRODIMAGE=gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver
22-
PRODVERSION=v0.1.0.alpha
22+
PRODVERSION=v0.2.0.beta
2323

2424
all: gce-pd-driver
2525

‎README.md‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
WARNING: This driver is in ALPHA currently. This means that there may be
2-
potentially backwards compatability breaking changes moving forward. Do NOT use
3-
this driver in a production environment in its current state.
4-
5-
WARNING: The ALPHA driver is NOT compatible with Kubernetes versions 1.12+.
1+
WARNING: The BETA driver is NOT compatible with Kubernetes versions <1.12.
62

73
DISCLAIMER: This is not an officially supported Google product
84

@@ -18,16 +14,17 @@ Specification compliant driver used by Container Orchestrators to manage the
1814
lifecycle of Google Compute Engine Persistent Disks.
1915

2016
## Project Status
21-
Status: Alpha
22-
Latest image: `gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver:v0.1.0.alpha`
17+
Status: Beta
18+
Latest image: `gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver:v0.2.0.beta`
2319

2420
### CSI Compatibility
2521
This plugin is compatible with CSI versions [v0.2.0](https://github.com/container-storage-interface/spec/blob/v0.2.0/spec.md) and [v0.3.0](https://github.com/container-storage-interface/spec/blob/v0.3.0/spec.md)
2622

2723
### Kubernetes Compatibility
2824
| GCE PD CSI Driver\Kubernetes Version | 1.10.5 - 1.11 | 1.12+ |
2925
|--------------------------------------|---------------|------|
30-
| v0.1.0.alpha (stable) | yes | no |
26+
| v0.1.0.alpha | yes | no |
27+
| v0.2.0.beta (stable) | no | yes |
3128
| dev | no | yes |
3229

3330
### Known Issues

‎deploy/kubernetes/dev/controller.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ spec:
2727
volumeMounts:
2828
- name: socket-dir
2929
mountPath: /csi
30-
3130
- name: csi-provisioner
3231
imagePullPolicy: Always
3332
image: quay.io/k8scsi/csi-provisioner:v0.4.1
@@ -43,7 +42,7 @@ spec:
4342
mountPath: /csi
4443
- name: csi-attacher
4544
imagePullPolicy: Always
46-
image: quay.io/k8scsi/csi-attacher:v0.3.0
45+
image: quay.io/k8scsi/csi-attacher:v0.4.1
4746
args:
4847
- "--v=5"
4948
- "--csi-address=$(ADDRESS)"

‎deploy/kubernetes/dev/node.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
containers:
1717
- name: csi-driver-registrar
1818
imagePullPolicy: Always
19-
image: quay.io/k8scsi/driver-registrar:v0.3.0
19+
image: quay.io/k8scsi/driver-registrar:v0.4.1
2020
args:
2121
- "--v=5"
2222
- "--csi-address=$(ADDRESS)"

‎deploy/kubernetes/stable/controller.yaml‎

Lines changed: 4 additions & 9 deletions
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.4.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.4.1
3434
args:
3535
- "--v=5"
3636
- "--csi-address=$(ADDRESS)"
@@ -42,18 +42,13 @@ spec:
4242
mountPath: /csi
4343
- name: gce-pd-driver
4444
imagePullPolicy: Always
45-
image: gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver:v0.1.0.alpha
45+
image: gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver:v0.2.0.beta
4646
args:
4747
- "--v=5"
4848
- "--endpoint=$(CSI_ENDPOINT)"
49-
- "--nodeid=$(KUBE_NODE_NAME)"
5049
env:
5150
- name: CSI_ENDPOINT
5251
value: unix:/csi/csi.sock
53-
- name: KUBE_NODE_NAME
54-
valueFrom:
55-
fieldRef:
56-
fieldPath: spec.nodeName
5752
- name: GOOGLE_APPLICATION_CREDENTIALS
5853
value: "/etc/cloud-sa/cloud-sa.json"
5954
volumeMounts:

‎deploy/kubernetes/stable/node.yaml‎

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#TODO: Force DaemonSet to not run on master.
1+
#TODO(#40): Force DaemonSet to not run on master.
22
kind: DaemonSet
33
apiVersion: apps/v1
44
metadata:
@@ -16,52 +16,56 @@ 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.4.1
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
3839
imagePullPolicy: Always
39-
image: gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver:v0.1.0.alpha
40+
image: gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver:v0.2.0.beta
4041
args:
4142
- "--v=5"
4243
- "--endpoint=$(CSI_ENDPOINT)"
43-
- "--nodeid=$(KUBE_NODE_NAME)"
4444
env:
4545
- name: CSI_ENDPOINT
4646
value: unix:/csi/csi.sock
47-
- name: KUBE_NODE_NAME
48-
valueFrom:
49-
fieldRef:
50-
fieldPath: spec.nodeName
5147
volumeMounts:
5248
- name: kubelet-dir
5349
mountPath: /var/lib/kubelet
5450
mountPropagation: "Bidirectional"
5551
- name: plugin-dir
5652
mountPath: /csi
5753
- name: device-dir
58-
mountPath: /host/dev
54+
mountPath: /dev
55+
# The following mounts are required to trigger host udevadm from container
56+
- name: udev-rules-etc
57+
mountPath: /etc/udev
58+
- name: udev-rules-lib
59+
mountPath: /lib/udev
60+
- name: udev-socket
61+
mountPath: /run/udev
62+
- name: sys
63+
mountPath: /sys
5964
volumes:
60-
# TODO(dependency): this will work when kublet registrar functionality exists
61-
#- name: registrar-socket-dir
62-
# hostPath:
63-
# path: /var/lib/kubelet/device-plugins/
64-
# type: DirectoryOrCreate
65+
- name: registration-dir
66+
hostPath:
67+
path: /var/lib/kubelet/plugins/
68+
type: Directory
6569
- name: kubelet-dir
6670
hostPath:
6771
path: /var/lib/kubelet
@@ -73,4 +77,21 @@ spec:
7377
- name: device-dir
7478
hostPath:
7579
path: /dev
76-
type: Directory
80+
type: Directory
81+
# The following mounts are required to trigger host udevadm from container
82+
- name: udev-rules-etc
83+
hostPath:
84+
path: /etc/udev
85+
type: Directory
86+
- name: udev-rules-lib
87+
hostPath:
88+
path: /lib/udev
89+
type: Directory
90+
- name: udev-socket
91+
hostPath:
92+
path: /run/udev
93+
type: Directory
94+
- name: sys
95+
hostPath:
96+
path: /sys
97+
type: Directory

0 commit comments

Comments
 (0)