Bumping k8s dependencies to 1.13
This commit is contained in:
5
vendor/k8s.io/kubernetes/test/e2e/storage/pd.go
generated
vendored
5
vendor/k8s.io/kubernetes/test/e2e/storage/pd.go
generated
vendored
@@ -40,6 +40,7 @@ import (
|
||||
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
"k8s.io/kubernetes/test/e2e/storage/utils"
|
||||
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -526,7 +527,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 = "busybox"
|
||||
containers[i].Image = imageutils.GetE2EImage(imageutils.BusyBox)
|
||||
containers[i].Command = []string{"sleep", "6000"}
|
||||
containers[i].VolumeMounts = make([]v1.VolumeMount, len(diskNames))
|
||||
for k := range diskNames {
|
||||
@@ -575,7 +576,7 @@ func testPDPod(diskNames []string, targetNode types.NodeName, readOnly bool, num
|
||||
return pod
|
||||
}
|
||||
|
||||
// Waits for specified PD to to detach from specified hostName
|
||||
// Waits for specified PD to detach from specified hostName
|
||||
func waitForPDDetach(diskName string, nodeName types.NodeName) error {
|
||||
if framework.TestContext.Provider == "gce" || framework.TestContext.Provider == "gke" {
|
||||
framework.Logf("Waiting for GCE PD %q to detach from node %q.", diskName, nodeName)
|
||||
|
Reference in New Issue
Block a user