Merge pull request kubernetes#89568 from SataQiu/staging-e2e-framework-20200327

k8s-ci-robot · web-flow · commit e3eb0532da09 · 2020-03-27T17:12:15.000-07:00
e2e/framework: remove direct import to pkg/kubelet/util/format
diff --git a/test/e2e/framework/pod/BUILD b/test/e2e/framework/pod/BUILD
@@ -13,7 +13,6 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/kubelet/types:go_default_library",
-        "//pkg/kubelet/util/format:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
diff --git a/test/e2e/framework/pod/wait.go b/test/e2e/framework/pod/wait.go
@@ -34,7 +34,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/kubectl/pkg/util/podutils"
-	"k8s.io/kubernetes/pkg/kubelet/util/format"
 	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
 	testutils "k8s.io/kubernetes/test/utils"
 )
@@ -302,7 +301,7 @@ func WaitForMatchPodsCondition(c clientset.Interface, opts metav1.ListOptions, d
 				return fmt.Errorf("Unexpected error: %v", err)
 			}
 			if !done {
-				conditionNotMatch = append(conditionNotMatch, format.Pod(&pod))
+				conditionNotMatch = append(conditionNotMatch, fmt.Sprintf("%s_%s(%s)", pod.Name, pod.Namespace, pod.UID))
 			}
 		}
 		if len(conditionNotMatch) <= 0 {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ import (`
`34`	`34`	`"k8s.io/apimachinery/pkg/util/wait"`
`35`	`35`	`clientset "k8s.io/client-go/kubernetes"`
`36`	`36`	`"k8s.io/kubectl/pkg/util/podutils"`
`37`		`- "k8s.io/kubernetes/pkg/kubelet/util/format"`
`38`	`37`	`e2elog "k8s.io/kubernetes/test/e2e/framework/log"`
`39`	`38`	`testutils "k8s.io/kubernetes/test/utils"`
`40`	`39`	`)`
`@@ -302,7 +301,7 @@ func WaitForMatchPodsCondition(c clientset.Interface, opts metav1.ListOptions, d`
`302`	`301`	`return fmt.Errorf("Unexpected error: %v", err)`
`303`	`302`	`}`
`304`	`303`	`if !done {`
`305`		`- conditionNotMatch = append(conditionNotMatch, format.Pod(&pod))`
	`304`	`+ conditionNotMatch = append(conditionNotMatch, fmt.Sprintf("%s_%s(%s)", pod.Name, pod.Namespace, pod.UID))`
`306`	`305`	`}`
`307`	`306`	`}`
`308`	`307`	`if len(conditionNotMatch) <= 0 {`