diff --git a/test/e2e/framework/kubectl/kubectl_utils.go b/test/e2e/framework/kubectl/kubectl_utils.go index d6765d23b47..e95d4b5f148 100644 --- a/test/e2e/framework/kubectl/kubectl_utils.go +++ b/test/e2e/framework/kubectl/kubectl_utils.go @@ -142,6 +142,10 @@ func (tk *TestKubeconfig) WriteFileViaContainer(podName, containerName string, p } } command := fmt.Sprintf("echo '%s' > '%s'; sync", contents, path) + // TODO(mauriciopoppe): remove this statement once we add `sync` to the test image, ref #101172 + if e2epod.NodeOSDistroIs("windows") { + command = fmt.Sprintf("echo '%s' > '%s';", contents, path) + } stdout, stderr, err := tk.kubectlExecWithRetry(tk.Namespace, podName, containerName, "--", "/bin/sh", "-c", command) if err != nil { e2elog.Logf("error running kubectl exec to write file: %v\nstdout=%v\nstderr=%v)", err, string(stdout), string(stderr)) diff --git a/test/e2e/storage/pd.go b/test/e2e/storage/pd.go index b3dc2ffd015..63118d06eb9 100644 --- a/test/e2e/storage/pd.go +++ b/test/e2e/storage/pd.go @@ -596,7 +596,7 @@ func testPDPod(diskNames []string, targetNode types.NodeName, readOnly bool, num if numContainers > 1 { containers[i].Name = fmt.Sprintf("mycontainer%v", i+1) } - containers[i].Image = imageutils.GetE2EImage(imageutils.BusyBox) + containers[i].Image = e2epod.GetTestImage(imageutils.BusyBox) containers[i].Command = []string{"sleep", "6000"} containers[i].VolumeMounts = make([]v1.VolumeMount, len(diskNames)) for k := range diskNames { @@ -636,7 +636,7 @@ func testPDPod(diskNames []string, targetNode types.NodeName, readOnly bool, num pod.Spec.Volumes[k].VolumeSource = v1.VolumeSource{ GCEPersistentDisk: &v1.GCEPersistentDiskVolumeSource{ PDName: diskName, - FSType: "ext4", + FSType: e2epv.GetDefaultFSType(), ReadOnly: readOnly, }, }