Fix metadata prefetch e2e tests.

GoogleCloudPlatform · Nov 15, 2024 · b7d6841 · b7d6841
1 parent 4818cf1
commit b7d6841
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/test/e2e/specs/specs.go b/test/e2e/specs/specs.go
@@ -82,7 +82,7 @@ const (
 	GolangImage         = "golang:1.22.7"
 	UbuntuImage         = "ubuntu:20.04"
 
-	LastPublishedSidecarContainerImage = "gcr.io/gke-release/gcs-fuse-csi-driver-sidecar-mounter@sha256:c83609ecf50d05a141167b8c6cf4dfe14ff07f01cd96a9790921db6748d40902"
+	LastPublishedSidecarContainerImage = "gcr.io/gke-release/gcs-fuse-csi-driver-sidecar-mounter@sha256:380bd2a716b936d9469d09e3a83baf22dddca1586a04a0060d7006ea78930cac"
 
 	pollInterval     = 1 * time.Second
 	pollTimeout      = 1 * time.Minute
@@ -497,13 +497,23 @@ func (t *TestPod) SetCustomSidecarContainerImage() {
 	})
 }
 
-func (t *TestPod) VerifyCustomSidecarContainerImage(isNativeSidecar bool) {
+func (t *TestPod) VerifyCustomSidecarContainerImage(isNativeSidecar, hasMetadataPrefetch bool) {
 	if isNativeSidecar {
-		gomega.Expect(t.pod.Spec.InitContainers).To(gomega.HaveLen(1))
+		if hasMetadataPrefetch {
+			gomega.Expect(t.pod.Spec.InitContainers).To(gomega.HaveLen(2))
+			gomega.Expect(t.pod.Spec.InitContainers[1].Name).To(gomega.Equal(webhook.MetadataPrefetchSidecarName))
+		} else {
+			gomega.Expect(t.pod.Spec.InitContainers).To(gomega.HaveLen(1))
+		}
 		gomega.Expect(t.pod.Spec.InitContainers[0].Name).To(gomega.Equal(webhook.GcsFuseSidecarName))
 		gomega.Expect(t.pod.Spec.InitContainers[0].Image).To(gomega.Equal(LastPublishedSidecarContainerImage))
 	} else {
-		gomega.Expect(t.pod.Spec.Containers).To(gomega.HaveLen(2))
+		if hasMetadataPrefetch {
+			gomega.Expect(t.pod.Spec.Containers).To(gomega.HaveLen(3))
+			gomega.Expect(t.pod.Spec.Containers[1].Name).To(gomega.Equal(webhook.MetadataPrefetchSidecarName))
+		} else {
+			gomega.Expect(t.pod.Spec.Containers).To(gomega.HaveLen(2))
+		}
 		gomega.Expect(t.pod.Spec.Containers[0].Name).To(gomega.Equal(webhook.GcsFuseSidecarName))
 		gomega.Expect(t.pod.Spec.Containers[0].Image).To(gomega.Equal(LastPublishedSidecarContainerImage))
 	}

diff --git a/test/e2e/testsuites/volumes.go b/test/e2e/testsuites/volumes.go
@@ -310,6 +310,12 @@ func (t *gcsFuseCSIVolumesTestSuite) DefineTests(driver storageframework.TestDri
 		init(configPrefix)
 		defer cleanup()
 
+		// Check if test is using metadata prefetch.
+		var hasMetadataPrefetch bool
+		if configPrefix == specs.EnableMetadataPrefetchPrefix {
+			hasMetadataPrefetch = true
+		}
+
 		ginkgo.By("Configuring the pod")
 		tPod := specs.NewTestPod(f.ClientSet, f.Namespace)
 		tPod.SetCustomSidecarContainerImage()
@@ -323,7 +329,7 @@ func (t *gcsFuseCSIVolumesTestSuite) DefineTests(driver storageframework.TestDri
 		tPod.WaitForRunning(ctx)
 
 		ginkgo.By("Checking that the sidecar container is using the custom image")
-		tPod.VerifyCustomSidecarContainerImage(supportsNativeSidecar)
+		tPod.VerifyCustomSidecarContainerImage(supportsNativeSidecar, hasMetadataPrefetch)
 
 		ginkgo.By("Checking that the pod command exits with no error")
 		tPod.VerifyExecInPodSucceed(f, specs.TesterContainerName, fmt.Sprintf("mount | grep %v | grep rw,", mountPath))