From d20845f635b8ff0edf8357996b4d6a2ddc1546d5 Mon Sep 17 00:00:00 2001 From: Cheng Xing Date: Mon, 1 Apr 2019 11:32:58 -0700 Subject: [PATCH 1/2] Fixed storage class nilpointer in RePD failover test --- test/e2e/storage/regional_pd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/storage/regional_pd.go b/test/e2e/storage/regional_pd.go index 6c360572e91..e162c5e3779 100644 --- a/test/e2e/storage/regional_pd.go +++ b/test/e2e/storage/regional_pd.go @@ -168,7 +168,7 @@ func testZonalFailover(c clientset.Interface, ns string) { } class := newStorageClass(testSpec, ns, "" /* suffix */) claimTemplate := newClaim(testSpec, ns, "" /* suffix */) - claimTemplate.Spec.StorageClassName = &testSpec.Class.Name + claimTemplate.Spec.StorageClassName = &class.Name statefulSet, service, regionalPDLabels := newStatefulSet(claimTemplate, ns) By("creating a StorageClass " + class.Name) From 60c28851948874f0f44fbcd4146e41be921d057e Mon Sep 17 00:00:00 2001 From: Cheng Xing Date: Mon, 1 Apr 2019 14:41:18 -0700 Subject: [PATCH 2/2] Regional PD failover e2e test: set pvc name explicitly instead of relying on GenerateName --- test/e2e/storage/regional_pd.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/e2e/storage/regional_pd.go b/test/e2e/storage/regional_pd.go index e162c5e3779..d176add54b4 100644 --- a/test/e2e/storage/regional_pd.go +++ b/test/e2e/storage/regional_pd.go @@ -49,6 +49,7 @@ const ( statefulSetReadyTimeout = 3 * time.Minute taintKeyPrefix = "zoneTaint_" repdMinSize = "200Gi" + pvcName = "regional-pd-vol" ) var _ = utils.SIGDescribe("Regional PD", func() { @@ -168,6 +169,7 @@ func testZonalFailover(c clientset.Interface, ns string) { } class := newStorageClass(testSpec, ns, "" /* suffix */) claimTemplate := newClaim(testSpec, ns, "" /* suffix */) + claimTemplate.Name = pvcName claimTemplate.Spec.StorageClassName = &class.Name statefulSet, service, regionalPDLabels := newStatefulSet(claimTemplate, ns) @@ -520,7 +522,7 @@ func newPodTemplate(labels map[string]string) *v1.PodTemplateSpec { Name: "web", }}, VolumeMounts: []v1.VolumeMount{{ - Name: "regional-pd-vol", + Name: pvcName, MountPath: "/mnt/data/regional-pd", }}, },