From fa41fa9acd4bd296e2eb8fd2f2dfe447150db223 Mon Sep 17 00:00:00 2001 From: David Zhu Date: Tue, 2 Oct 2018 16:26:36 -0700 Subject: [PATCH] Update provisioner name and don't supply zone in GCE PD CSI test --- test/e2e/storage/csi_volumes.go | 11 ++++------- .../storage-csi/gce-pd/controller_ss.yaml | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/test/e2e/storage/csi_volumes.go b/test/e2e/storage/csi_volumes.go index 720660efc44..7d0c714b0c8 100644 --- a/test/e2e/storage/csi_volumes.go +++ b/test/e2e/storage/csi_volumes.go @@ -30,7 +30,6 @@ import ( clientset "k8s.io/client-go/kubernetes" csiv1alpha1 "k8s.io/csi-api/pkg/apis/csi/v1alpha1" csiclient "k8s.io/csi-api/pkg/client/clientset/versioned" - kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/storage/utils" imageutils "k8s.io/kubernetes/test/utils/image" @@ -364,6 +363,7 @@ type gcePDCSIDriver struct { func initCSIgcePD(f *framework.Framework, config framework.VolumeTestConfig) csiTestDriver { cs := f.ClientSet framework.SkipUnlessProviderIs("gce", "gke") + framework.SkipIfMultizone(cs) // TODO(#62561): Use credentials through external pod identity when that goes GA instead of downloading keys. createGCESecrets(cs, config) @@ -384,13 +384,10 @@ func initCSIgcePD(f *framework.Framework, config framework.VolumeTestConfig) csi } func (g *gcePDCSIDriver) createStorageClassTest(node v1.Node) storageClassTest { - nodeZone, ok := node.GetLabels()[kubeletapis.LabelZoneFailureDomain] - Expect(ok).To(BeTrue(), "Could not get label %v from node %v", kubeletapis.LabelZoneFailureDomain, node.GetName()) - return storageClassTest{ - name: "csi-gce-pd", - provisioner: "csi-gce-pd", - parameters: map[string]string{"type": "pd-standard", "zone": nodeZone}, + name: "com.google.csi.gcepd", + provisioner: "com.google.csi.gcepd", + parameters: map[string]string{"type": "pd-standard"}, claimSize: "5Gi", expectedSize: "5Gi", nodeName: node.Name, diff --git a/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml b/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml index 36a43ce4b80..82c153f5a1a 100644 --- a/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml +++ b/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml @@ -19,7 +19,7 @@ spec: image: quay.io/k8scsi/csi-provisioner:v0.2.0 args: - "--v=5" - - "--provisioner=csi-gce-pd" + - "--provisioner=com.google.csi.gcepd" - "--csi-address=$(ADDRESS)" env: - name: ADDRESS