Merge pull request kubernetes#77427 from draveness/feature/use-logf-in-log-pkg

refactor: use e2elog.Logf instead of framework.Logf

Author: k8s-ci-robot

test/e2e/BUILD

@@ -66,6 +66,7 @@ go_library(
         "//test/e2e/framework:go_default_library",
         "//test/e2e/framework/auth:go_default_library",
         "//test/e2e/framework/ginkgowrapper:go_default_library",
+        "//test/e2e/framework/log:go_default_library",
         "//test/e2e/framework/metrics:go_default_library",
         "//test/e2e/framework/providers/aws:go_default_library",
         "//test/e2e/framework/providers/azure:go_default_library",

test/e2e/e2e.go

@@ -38,6 +38,7 @@ import (
 	commontest "k8s.io/kubernetes/test/e2e/common"
 	"k8s.io/kubernetes/test/e2e/framework"
 	"k8s.io/kubernetes/test/e2e/framework/ginkgowrapper"
+	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
 	"k8s.io/kubernetes/test/e2e/framework/metrics"
 	"k8s.io/kubernetes/test/e2e/manifest"
 	testutils "k8s.io/kubernetes/test/utils"
@@ -119,26 +120,26 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
 	// number equal to the number of allowed not-ready nodes).
 	if err := framework.WaitForPodsRunningReady(c, metav1.NamespaceSystem, int32(framework.TestContext.MinStartupPods), int32(framework.TestContext.AllowedNotReadyNodes), podStartupTimeout, map[string]string{}); err != nil {
 		framework.DumpAllNamespaceInfo(c, metav1.NamespaceSystem)
-		framework.LogFailedContainers(c, metav1.NamespaceSystem, framework.Logf)
+		framework.LogFailedContainers(c, metav1.NamespaceSystem, e2elog.Logf)
 		runKubernetesServiceTestContainer(c, metav1.NamespaceDefault)
 		framework.Failf("Error waiting for all pods to be running and ready: %v", err)
 	}
 
 	if err := framework.WaitForDaemonSets(c, metav1.NamespaceSystem, int32(framework.TestContext.AllowedNotReadyNodes), framework.TestContext.SystemDaemonsetStartupTimeout); err != nil {
-		framework.Logf("WARNING: Waiting for all daemonsets to be ready failed: %v", err)
+		e2elog.Logf("WARNING: Waiting for all daemonsets to be ready failed: %v", err)
 	}
 
 	// Log the version of the server and this client.
-	framework.Logf("e2e test version: %s", version.Get().GitVersion)
+	e2elog.Logf("e2e test version: %s", version.Get().GitVersion)
 
 	dc := c.DiscoveryClient
 
 	serverVersion, serverErr := dc.ServerVersion()
 	if serverErr != nil {
-		framework.Logf("Unexpected server error retrieving version: %v", serverErr)
+		e2elog.Logf("Unexpected server error retrieving version: %v", serverErr)
 	}
 	if serverVersion != nil {
-		framework.Logf("kube-apiserver version: %s", serverVersion.GitVersion)
+		e2elog.Logf("kube-apiserver version: %s", serverVersion.GitVersion)
 	}
 
 	// Reference common test to make the import valid.
@@ -160,17 +161,17 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
 // and then the function that only runs on the first Ginkgo node.
 var _ = ginkgo.SynchronizedAfterSuite(func() {
 	// Run on all Ginkgo nodes
-	framework.Logf("Running AfterSuite actions on all nodes")
+	e2elog.Logf("Running AfterSuite actions on all nodes")
 	framework.RunCleanupActions()
 }, func() {
 	// Run only Ginkgo on node 1
-	framework.Logf("Running AfterSuite actions on node 1")
+	e2elog.Logf("Running AfterSuite actions on node 1")
 	if framework.TestContext.ReportDir != "" {
 		framework.CoreDump(framework.TestContext.ReportDir)
 	}
 	if framework.TestContext.GatherSuiteMetricsAfterTest {
 		if err := gatherTestSuiteMetrics(); err != nil {
-			framework.Logf("Error gathering metrics: %v", err)
+			e2elog.Logf("Error gathering metrics: %v", err)
 		}
 	}
 	if framework.TestContext.NodeKiller.Enabled {
@@ -179,7 +180,7 @@ var _ = ginkgo.SynchronizedAfterSuite(func() {
 })
 
 func gatherTestSuiteMetrics() error {
-	framework.Logf("Gathering metrics")
+	e2elog.Logf("Gathering metrics")
 	c, err := framework.LoadClientset()
 	if err != nil {
 		return fmt.Errorf("error loading client: %v", err)
@@ -204,7 +205,7 @@ func gatherTestSuiteMetrics() error {
 			return fmt.Errorf("error writing to %q: %v", filePath, err)
 		}
 	} else {
-		framework.Logf("\n\nTest Suite Metrics:\n%s\n", metricsJSON)
+		e2elog.Logf("\n\nTest Suite Metrics:\n%s\n", metricsJSON)
 	}
 
 	return nil
@@ -246,31 +247,31 @@ func RunE2ETests(t *testing.T) {
 // to flip to Ready, log its output and delete it.
 func runKubernetesServiceTestContainer(c clientset.Interface, ns string) {
 	path := "test/images/clusterapi-tester/pod.yaml"
-	framework.Logf("Parsing pod from %v", path)
+	e2elog.Logf("Parsing pod from %v", path)
 	p, err := manifest.PodFromManifest(path)
 	if err != nil {
-		framework.Logf("Failed to parse clusterapi-tester from manifest %v: %v", path, err)
+		e2elog.Logf("Failed to parse clusterapi-tester from manifest %v: %v", path, err)
 		return
 	}
 	p.Namespace = ns
 	if _, err := c.CoreV1().Pods(ns).Create(p); err != nil {
-		framework.Logf("Failed to create %v: %v", p.Name, err)
+		e2elog.Logf("Failed to create %v: %v", p.Name, err)
 		return
 	}
 	defer func() {
 		if err := c.CoreV1().Pods(ns).Delete(p.Name, nil); err != nil {
-			framework.Logf("Failed to delete pod %v: %v", p.Name, err)
+			e2elog.Logf("Failed to delete pod %v: %v", p.Name, err)
 		}
 	}()
 	timeout := 5 * time.Minute
 	if err := framework.WaitForPodCondition(c, ns, p.Name, "clusterapi-tester", timeout, testutils.PodRunningReady); err != nil {
-		framework.Logf("Pod %v took longer than %v to enter running/ready: %v", p.Name, timeout, err)
+		e2elog.Logf("Pod %v took longer than %v to enter running/ready: %v", p.Name, timeout, err)
 		return
 	}
 	logs, err := framework.GetPodLogs(c, ns, p.Name, p.Spec.Containers[0].Name)
 	if err != nil {
-		framework.Logf("Failed to retrieve logs from %v: %v", p.Name, err)
+		e2elog.Logf("Failed to retrieve logs from %v: %v", p.Name, err)
 	} else {
-		framework.Logf("Output of clusterapi-tester:\n%v", logs)
+		e2elog.Logf("Output of clusterapi-tester:\n%v", logs)
 	}
 }

test/e2e/examples.go

@@ -31,6 +31,7 @@ import (
 	commonutils "k8s.io/kubernetes/test/e2e/common"
 	"k8s.io/kubernetes/test/e2e/framework"
 	"k8s.io/kubernetes/test/e2e/framework/auth"
+	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
 	"k8s.io/kubernetes/test/e2e/framework/testfiles"
 
 	. "github.com/onsi/ginkgo"
@@ -82,14 +83,14 @@ var _ = framework.KubeDescribe("[Feature:Example]", func() {
 					pod, err := c.CoreV1().Pods(ns).Get(podName, metav1.GetOptions{})
 					framework.ExpectNoError(err, fmt.Sprintf("getting pod %s", podName))
 					stat := podutil.GetExistingContainerStatus(pod.Status.ContainerStatuses, podName)
-					framework.Logf("Pod: %s, restart count:%d", stat.Name, stat.RestartCount)
+					e2elog.Logf("Pod: %s, restart count:%d", stat.Name, stat.RestartCount)
 					if stat.RestartCount > 0 {
-						framework.Logf("Saw %v restart, succeeded...", podName)
+						e2elog.Logf("Saw %v restart, succeeded...", podName)
 						wg.Done()
 						return
 					}
 				}
-				framework.Logf("Failed waiting for %v restart! ", podName)
+				e2elog.Logf("Failed waiting for %v restart! ", podName)
 				passed = false
 				wg.Done()
 			}

test/e2e/gke_local_ssd.go

@@ -24,6 +24,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/kubernetes/test/e2e/framework"
+	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
 
 	. "github.com/onsi/ginkgo"
 )
@@ -37,14 +38,14 @@ var _ = framework.KubeDescribe("GKE local SSD [Feature:GKELocalSSD]", func() {
 	})
 
 	It("should write and read from node local SSD [Feature:GKELocalSSD]", func() {
-		framework.Logf("Start local SSD test")
+		e2elog.Logf("Start local SSD test")
 		createNodePoolWithLocalSsds("np-ssd")
 		doTestWriteAndReadToLocalSsd(f)
 	})
 })
 
 func createNodePoolWithLocalSsds(nodePoolName string) {
-	framework.Logf("Create node pool: %s with local SSDs in cluster: %s ",
+	e2elog.Logf("Create node pool: %s with local SSDs in cluster: %s ",
 		nodePoolName, framework.TestContext.CloudConfig.Cluster)
 	out, err := exec.Command("gcloud", "alpha", "container", "node-pools", "create",
 		nodePoolName,
@@ -53,7 +54,7 @@ func createNodePoolWithLocalSsds(nodePoolName string) {
 	if err != nil {
 		framework.Failf("Failed to create node pool %s: Err: %v\n%v", nodePoolName, err, string(out))
 	}
-	framework.Logf("Successfully created node pool %s:\n%v", nodePoolName, string(out))
+	e2elog.Logf("Successfully created node pool %s:\n%v", nodePoolName, string(out))
 }
 
 func doTestWriteAndReadToLocalSsd(f *framework.Framework) {

test/e2e/gke_node_pools.go

@@ -21,6 +21,7 @@ import (
 	"os/exec"
 
 	"k8s.io/kubernetes/test/e2e/framework"
+	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
 
 	. "github.com/onsi/ginkgo"
 )
@@ -34,64 +35,64 @@ var _ = framework.KubeDescribe("GKE node pools [Feature:GKENodePool]", func() {
 	})
 
 	It("should create a cluster with multiple node pools [Feature:GKENodePool]", func() {
-		framework.Logf("Start create node pool test")
+		e2elog.Logf("Start create node pool test")
 		testCreateDeleteNodePool(f, "test-pool")
 	})
 })
 
 func testCreateDeleteNodePool(f *framework.Framework, poolName string) {
-	framework.Logf("Create node pool: %q in cluster: %q", poolName, framework.TestContext.CloudConfig.Cluster)
+	e2elog.Logf("Create node pool: %q in cluster: %q", poolName, framework.TestContext.CloudConfig.Cluster)
 
 	clusterStr := fmt.Sprintf("--cluster=%s", framework.TestContext.CloudConfig.Cluster)
 
 	out, err := exec.Command("gcloud", "container", "node-pools", "create",
 		poolName,
 		clusterStr,
 		"--num-nodes=2").CombinedOutput()
-	framework.Logf("\n%s", string(out))
+	e2elog.Logf("\n%s", string(out))
 	if err != nil {
 		framework.Failf("Failed to create node pool %q. Err: %v\n%v", poolName, err, string(out))
 	}
-	framework.Logf("Successfully created node pool %q.", poolName)
+	e2elog.Logf("Successfully created node pool %q.", poolName)
 
 	out, err = exec.Command("gcloud", "container", "node-pools", "list",
 		clusterStr).CombinedOutput()
 	if err != nil {
 		framework.Failf("Failed to list node pools from cluster %q. Err: %v\n%v", framework.TestContext.CloudConfig.Cluster, err, string(out))
 	}
-	framework.Logf("Node pools:\n%s", string(out))
+	e2elog.Logf("Node pools:\n%s", string(out))
 
-	framework.Logf("Checking that 2 nodes have the correct node pool label.")
+	e2elog.Logf("Checking that 2 nodes have the correct node pool label.")
 	nodeCount := nodesWithPoolLabel(f, poolName)
 	if nodeCount != 2 {
 		framework.Failf("Wanted 2 nodes with node pool label, got: %v", nodeCount)
 	}
-	framework.Logf("Success, found 2 nodes with correct node pool labels.")
+	e2elog.Logf("Success, found 2 nodes with correct node pool labels.")
 
-	framework.Logf("Deleting node pool: %q in cluster: %q", poolName, framework.TestContext.CloudConfig.Cluster)
+	e2elog.Logf("Deleting node pool: %q in cluster: %q", poolName, framework.TestContext.CloudConfig.Cluster)
 	out, err = exec.Command("gcloud", "container", "node-pools", "delete",
 		poolName,
 		clusterStr,
 		"-q").CombinedOutput()
-	framework.Logf("\n%s", string(out))
+	e2elog.Logf("\n%s", string(out))
 	if err != nil {
 		framework.Failf("Failed to delete node pool %q. Err: %v\n%v", poolName, err, string(out))
 	}
-	framework.Logf("Successfully deleted node pool %q.", poolName)
+	e2elog.Logf("Successfully deleted node pool %q.", poolName)
 
 	out, err = exec.Command("gcloud", "container", "node-pools", "list",
 		clusterStr).CombinedOutput()
 	if err != nil {
 		framework.Failf("\nFailed to list node pools from cluster %q. Err: %v\n%v", framework.TestContext.CloudConfig.Cluster, err, string(out))
 	}
-	framework.Logf("\nNode pools:\n%s", string(out))
+	e2elog.Logf("\nNode pools:\n%s", string(out))
 
-	framework.Logf("Checking that no nodes have the deleted node pool's label.")
+	e2elog.Logf("Checking that no nodes have the deleted node pool's label.")
 	nodeCount = nodesWithPoolLabel(f, poolName)
 	if nodeCount != 0 {
 		framework.Failf("Wanted 0 nodes with node pool label, got: %v", nodeCount)
 	}
-	framework.Logf("Success, found no nodes with the deleted node pool's label.")
+	e2elog.Logf("Success, found no nodes with the deleted node pool's label.")
 }
 
 // nodesWithPoolLabel returns the number of nodes that have the "gke-nodepool"

test/e2e/scheduling/BUILD

@@ -45,6 +45,7 @@ go_library(
         "//test/e2e/common:go_default_library",
         "//test/e2e/framework:go_default_library",
         "//test/e2e/framework/gpu:go_default_library",
+        "//test/e2e/framework/log:go_default_library",
         "//test/e2e/framework/providers/gce:go_default_library",
         "//test/e2e/framework/replicaset:go_default_library",
         "//test/utils:go_default_library",

test/e2e/scheduling/equivalence_cache_predicates.go

@@ -27,6 +27,7 @@ import (
 	clientset "k8s.io/client-go/kubernetes"
 	api "k8s.io/kubernetes/pkg/apis/core"
 	"k8s.io/kubernetes/test/e2e/framework"
+	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
 	testutils "k8s.io/kubernetes/test/utils"
 	imageutils "k8s.io/kubernetes/test/utils/image"
 
@@ -72,7 +73,7 @@ var _ = framework.KubeDescribe("EquivalenceCache [Serial]", func() {
 		Expect(err).NotTo(HaveOccurred())
 
 		for _, node := range nodeList.Items {
-			framework.Logf("\nLogging pods the kubelet thinks is on node %v before test", node.Name)
+			e2elog.Logf("\nLogging pods the kubelet thinks is on node %v before test", node.Name)
 			framework.PrintAllKubeletPods(cs, node.Name)
 		}
 

test/e2e/scheduling/limit_range.go

@@ -28,6 +28,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/kubernetes/test/e2e/framework"
+	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -100,7 +101,7 @@ var _ = SIGDescribe("LimitRange", func() {
 			err = equalResourceRequirement(expected, pod.Spec.Containers[i].Resources)
 			if err != nil {
 				// Print the pod to help in debugging.
-				framework.Logf("Pod %+v does not have the expected requirements", pod)
+				e2elog.Logf("Pod %+v does not have the expected requirements", pod)
 				Expect(err).NotTo(HaveOccurred())
 			}
 		}
@@ -121,7 +122,7 @@ var _ = SIGDescribe("LimitRange", func() {
 			err = equalResourceRequirement(expected, pod.Spec.Containers[i].Resources)
 			if err != nil {
 				// Print the pod to help in debugging.
-				framework.Logf("Pod %+v does not have the expected requirements", pod)
+				e2elog.Logf("Pod %+v does not have the expected requirements", pod)
 				Expect(err).NotTo(HaveOccurred())
 			}
 		}
@@ -170,18 +171,18 @@ var _ = SIGDescribe("LimitRange", func() {
 			limitRanges, err := f.ClientSet.CoreV1().LimitRanges(f.Namespace.Name).List(options)
 
 			if err != nil {
-				framework.Logf("Unable to retrieve LimitRanges: %v", err)
+				e2elog.Logf("Unable to retrieve LimitRanges: %v", err)
 				return false, nil
 			}
 
 			if len(limitRanges.Items) == 0 {
-				framework.Logf("limitRange is already deleted")
+				e2elog.Logf("limitRange is already deleted")
 				return true, nil
 			}
 
 			if len(limitRanges.Items) > 0 {
 				if limitRanges.Items[0].ObjectMeta.DeletionTimestamp == nil {
-					framework.Logf("deletion has not yet been observed")
+					e2elog.Logf("deletion has not yet been observed")
 					return false, nil
 				}
 				return true, nil
@@ -200,12 +201,12 @@ var _ = SIGDescribe("LimitRange", func() {
 })
 
 func equalResourceRequirement(expected v1.ResourceRequirements, actual v1.ResourceRequirements) error {
-	framework.Logf("Verifying requests: expected %v with actual %v", expected.Requests, actual.Requests)
+	e2elog.Logf("Verifying requests: expected %v with actual %v", expected.Requests, actual.Requests)
 	err := equalResourceList(expected.Requests, actual.Requests)
 	if err != nil {
 		return err
 	}
-	framework.Logf("Verifying limits: expected %v with actual %v", expected.Limits, actual.Limits)
+	e2elog.Logf("Verifying limits: expected %v with actual %v", expected.Limits, actual.Limits)
 	err = equalResourceList(expected.Limits, actual.Limits)
 	return err
 }