github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

fix Pod Disks schedule pods each with a PD test in windows

Browse Source
This commit is contained in:
Mauricio Poppe 2021-03-18 06:42:43 +00:00
parent 54449be031
commit 2ac6d4d133
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/framework/kubectl/kubectl_utils.go
View File

@ -142,6 +142,10 @@ func (tk *TestKubeconfig) WriteFileViaContainer(podName, containerName string, p
} }
} }
command := fmt.Sprintf("echo '%s' > '%s'; sync", contents, path) command := fmt.Sprintf("echo '%s' > '%s'; sync", contents, path)
// TODO: replace with `framework.NodeOSDistroIs` when #81245 is complete
if e2epod.NodeOSDistroIs("windows") {
command = fmt.Sprintf("echo '%s' > '%s'; sleep 1", contents, path)
}
stdout, stderr, err := tk.kubectlExecWithRetry(tk.Namespace, podName, containerName, "--", "/bin/sh", "-c", command) stdout, stderr, err := tk.kubectlExecWithRetry(tk.Namespace, podName, containerName, "--", "/bin/sh", "-c", command)
if err != nil { if err != nil {
e2elog.Logf("error running kubectl exec to write file: %v\nstdout=%v\nstderr=%v)", err, string(stdout), string(stderr)) e2elog.Logf("error running kubectl exec to write file: %v\nstdout=%v\nstderr=%v)", err, string(stdout), string(stderr))

4
test/e2e/storage/pd.go
View File

@ -596,7 +596,7 @@ func testPDPod(diskNames []string, targetNode types.NodeName, readOnly bool, num
if numContainers > 1 { if numContainers > 1 {
containers[i].Name = fmt.Sprintf("mycontainer%v", i+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].Command = []string{"sleep", "6000"}
containers[i].VolumeMounts = make([]v1.VolumeMount, len(diskNames)) containers[i].VolumeMounts = make([]v1.VolumeMount, len(diskNames))
for k := range 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{ pod.Spec.Volumes[k].VolumeSource = v1.VolumeSource{
GCEPersistentDisk: &v1.GCEPersistentDiskVolumeSource{ GCEPersistentDisk: &v1.GCEPersistentDiskVolumeSource{
PDName: diskName, PDName: diskName,
FSType: "ext4", FSType: e2epv.GetDefaultFSType(),
ReadOnly: readOnly, ReadOnly: readOnly,
}, },
} }