Merge pull request #70597 from msau42/update-pd-csi

Update pd csi e2e yamls with latest driver
This commit is contained in:
k8s-ci-robot 2018-11-02 18:02:17 -07:00 committed by GitHub
commit 247b8fffb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 38 additions and 35 deletions

View File

@ -451,7 +451,6 @@ func (g *gcePDCSIDriver) createCSIDriver() {
"test/e2e/testing-manifests/storage-csi/gce-pd/csi-controller-rbac.yaml",
"test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml",
"test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml",
"test/e2e/testing-manifests/storage-csi/gce-pd/controller_service.yaml",
)
g.cleanup = cleanup
if err != nil {

View File

@ -1,12 +0,0 @@
kind: Service
apiVersion: v1
metadata:
name: csi-gce-pd
labels:
app: csi-gce-pd
spec:
selector:
app: csi-gce-pd
ports:
- name: dummy
port: 12345

View File

@ -1,5 +1,5 @@
kind: StatefulSet
apiVersion: apps/v1beta1
apiVersion: apps/v1
metadata:
name: csi-gce-controller
spec:
@ -17,7 +17,7 @@ spec:
containers:
- name: csi-external-provisioner
imagePullPolicy: Always
image: quay.io/k8scsi/csi-provisioner:v0.4.1
image: gcr.io/gke-release/csi-provisioner:v0.4.1-gke.0
args:
- "--v=5"
- "--provisioner=com.google.csi.gcepd"
@ -27,7 +27,7 @@ spec:
mountPath: /csi
- name: csi-attacher
imagePullPolicy: Always
image: quay.io/k8scsi/csi-attacher:v0.4.1
image: gcr.io/gke-release/csi-attacher:v0.4.1-gke.0
args:
- "--v=5"
- "--csi-address=/csi/csi.sock"
@ -36,16 +36,11 @@ spec:
mountPath: /csi
- name: gce-driver
imagePullPolicy: Always
image: gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver:v0.1.0.alpha
image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v0.2.0-gke.0
args:
- "--v=5"
- "--endpoint=unix:///csi/csi.sock"
- "--nodeid=$(KUBE_NODE_NAME)"
env:
- name: KUBE_NODE_NAME
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: GOOGLE_APPLICATION_CREDENTIALS
value: "/etc/service-account/cloud-sa.json"
volumeMounts:

View File

@ -16,7 +16,7 @@ spec:
containers:
- name: csi-driver-registrar
imagePullPolicy: Always
image: quay.io/k8scsi/driver-registrar:v0.4.1
image: gcr.io/gke-release/csi-driver-registrar:v0.4.1-gke.0
args:
- "--v=5"
- "--csi-address=/csi/csi.sock"
@ -35,16 +35,10 @@ spec:
securityContext:
privileged: true
imagePullPolicy: Always
image: gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver:v0.1.0.alpha
image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v0.2.0-gke.0
args:
- "--v=5"
- "--endpoint=unix:///csi/csi.sock"
- "--nodeid=$(KUBE_NODE_NAME)"
env:
- name: KUBE_NODE_NAME
valueFrom:
fieldRef:
fieldPath: spec.nodeName
volumeMounts:
- name: kubelet-dir
mountPath: /var/lib/kubelet
@ -52,8 +46,21 @@ spec:
- name: plugin-dir
mountPath: /csi
- name: device-dir
mountPath: /host/dev
mountPath: /dev
# The following mounts are required to trigger host udevadm from container
- name: udev-rules-etc
mountPath: /etc/udev
- name: udev-rules-lib
mountPath: /lib/udev
- name: udev-socket
mountPath: /run/udev
- name: sys
mountPath: /sys
volumes:
- name: registration-dir
hostPath:
path: /var/lib/kubelet/plugins/
type: Directory
- name: kubelet-dir
hostPath:
path: /var/lib/kubelet
@ -62,11 +69,25 @@ spec:
hostPath:
path: /var/lib/kubelet/plugins/com.google.csi.gcepd/
type: DirectoryOrCreate
- name: registration-dir
hostPath:
path: /var/lib/kubelet/plugins/
type: Directory
- name: device-dir
hostPath:
path: /dev
type: Directory
# The following mounts are required to trigger host udevadm from container
- name: udev-rules-etc
hostPath:
path: /etc/udev
type: Directory
- name: udev-rules-lib
hostPath:
path: /lib/udev
type: Directory
- name: udev-socket
hostPath:
path: /run/udev
type: Directory
- name: sys
hostPath:
path: /sys
type: Directory