Skip to content

Commit 07e58a3

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#82691 from hwdef/use-log-func1
use log func in test/e2e/network
2 parents 698d264 + af16366 commit 07e58a3

18 files changed

+295
-312
lines changed

‎test/e2e/network/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ go_library(
6565
"//test/e2e/framework/deployment:go_default_library",
6666
"//test/e2e/framework/endpoints:go_default_library",
6767
"//test/e2e/framework/ingress:go_default_library",
68-
"//test/e2e/framework/log:go_default_library",
6968
"//test/e2e/framework/node:go_default_library",
7069
"//test/e2e/framework/pod:go_default_library",
7170
"//test/e2e/framework/providers/gce:go_default_library",

‎test/e2e/network/dns.go‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
"k8s.io/apimachinery/pkg/util/wait"
2727
"k8s.io/kubernetes/test/e2e/framework"
28-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
2928
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
3029

3130
"github.com/onsi/ginkgo"
@@ -406,11 +405,11 @@ var _ = SIGDescribe("DNS", func() {
406405
}
407406
testAgnhostPod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(testAgnhostPod)
408407
framework.ExpectNoError(err, "failed to create pod: %s", testAgnhostPod.Name)
409-
e2elog.Logf("Created pod %v", testAgnhostPod)
408+
framework.Logf("Created pod %v", testAgnhostPod)
410409
defer func() {
411-
e2elog.Logf("Deleting pod %s...", testAgnhostPod.Name)
410+
framework.Logf("Deleting pod %s...", testAgnhostPod.Name)
412411
if err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(testAgnhostPod.Name, metav1.NewDeleteOptions(0)); err != nil {
413-
e2elog.Failf("ginkgo.Failed to delete pod %s: %v", testAgnhostPod.Name, err)
412+
framework.Failf("ginkgo.Failed to delete pod %s: %v", testAgnhostPod.Name, err)
414413
}
415414
}()
416415
err = f.WaitForPodRunning(testAgnhostPod.Name)
@@ -433,13 +432,13 @@ var _ = SIGDescribe("DNS", func() {
433432
ginkgo.By("Verifying customized DNS suffix list is configured on pod...")
434433
stdout := runCommand("dns-suffix")
435434
if !strings.Contains(stdout, testSearchPath) {
436-
e2elog.Failf("customized DNS suffix list not found configured in pod, expected to contain: %s, got: %s", testSearchPath, stdout)
435+
framework.Failf("customized DNS suffix list not found configured in pod, expected to contain: %s, got: %s", testSearchPath, stdout)
437436
}
438437

439438
ginkgo.By("Verifying customized DNS server is configured on pod...")
440439
stdout = runCommand("dns-server-list")
441440
if !strings.Contains(stdout, testServerIP) {
442-
e2elog.Failf("customized DNS server not found in configured in pod, expected to contain: %s, got: %s", testServerIP, stdout)
441+
framework.Failf("customized DNS server not found in configured in pod, expected to contain: %s, got: %s", testServerIP, stdout)
443442
}
444443
})
445444

@@ -455,11 +454,11 @@ var _ = SIGDescribe("DNS", func() {
455454
})
456455
testServerPod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(testServerPod)
457456
framework.ExpectNoError(err, "failed to create pod: %s", testServerPod.Name)
458-
e2elog.Logf("Created pod %v", testServerPod)
457+
framework.Logf("Created pod %v", testServerPod)
459458
defer func() {
460-
e2elog.Logf("Deleting pod %s...", testServerPod.Name)
459+
framework.Logf("Deleting pod %s...", testServerPod.Name)
461460
if err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(testServerPod.Name, metav1.NewDeleteOptions(0)); err != nil {
462-
e2elog.Failf("ginkgo.Failed to delete pod %s: %v", testServerPod.Name, err)
461+
framework.Failf("ginkgo.Failed to delete pod %s: %v", testServerPod.Name, err)
463462
}
464463
}()
465464
err = f.WaitForPodRunning(testServerPod.Name)
@@ -469,7 +468,7 @@ var _ = SIGDescribe("DNS", func() {
469468
testServerPod, err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Get(testServerPod.Name, metav1.GetOptions{})
470469
framework.ExpectNoError(err, "failed to get pod %v", testServerPod.Name)
471470
testServerIP := testServerPod.Status.PodIP
472-
e2elog.Logf("testServerIP is %s", testServerIP)
471+
framework.Logf("testServerIP is %s", testServerIP)
473472

474473
ginkgo.By("Creating a pod with dnsPolicy=None and customized dnsConfig...")
475474
testUtilsPod := generateDNSUtilsPod()
@@ -487,11 +486,11 @@ var _ = SIGDescribe("DNS", func() {
487486
}
488487
testUtilsPod, err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(testUtilsPod)
489488
framework.ExpectNoError(err, "failed to create pod: %s", testUtilsPod.Name)
490-
e2elog.Logf("Created pod %v", testUtilsPod)
489+
framework.Logf("Created pod %v", testUtilsPod)
491490
defer func() {
492-
e2elog.Logf("Deleting pod %s...", testUtilsPod.Name)
491+
framework.Logf("Deleting pod %s...", testUtilsPod.Name)
493492
if err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(testUtilsPod.Name, metav1.NewDeleteOptions(0)); err != nil {
494-
e2elog.Failf("ginkgo.Failed to delete pod %s: %v", testUtilsPod.Name, err)
493+
framework.Failf("ginkgo.Failed to delete pod %s: %v", testUtilsPod.Name, err)
495494
}
496495
}()
497496
err = f.WaitForPodRunning(testUtilsPod.Name)
@@ -510,7 +509,7 @@ var _ = SIGDescribe("DNS", func() {
510509
})
511510
framework.ExpectNoError(err, "failed to examine resolv,conf file on pod, stdout: %v, stderr: %v, err: %v", stdout, stderr, err)
512511
if !strings.Contains(stdout, "ndots:2") {
513-
e2elog.Failf("customized DNS options not found in resolv.conf, got: %s", stdout)
512+
framework.Failf("customized DNS options not found in resolv.conf, got: %s", stdout)
514513
}
515514

516515
ginkgo.By("Verifying customized name server and search path are working...")
@@ -529,12 +528,12 @@ var _ = SIGDescribe("DNS", func() {
529528
CaptureStderr: true,
530529
})
531530
if err != nil {
532-
e2elog.Logf("ginkgo.Failed to execute dig command, stdout:%v, stderr: %v, err: %v", stdout, stderr, err)
531+
framework.Logf("ginkgo.Failed to execute dig command, stdout:%v, stderr: %v, err: %v", stdout, stderr, err)
533532
return false, nil
534533
}
535534
res := strings.Split(stdout, "\n")
536535
if len(res) != 1 || res[0] != testInjectedIP {
537-
e2elog.Logf("Expect command `%v` to return %s, got: %v", cmd, testInjectedIP, res)
536+
framework.Logf("Expect command `%v` to return %s, got: %v", cmd, testInjectedIP, res)
538537
return false, nil
539538
}
540539
return true, nil

‎test/e2e/network/dns_common.go‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import (
3333
"k8s.io/apimachinery/pkg/util/wait"
3434
clientset "k8s.io/client-go/kubernetes"
3535
"k8s.io/kubernetes/test/e2e/framework"
36-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3736
imageutils "k8s.io/kubernetes/test/utils/image"
3837

3938
"github.com/onsi/ginkgo"
@@ -73,7 +72,7 @@ func (t *dnsTestCommon) init() {
7372
gomega.Expect(len(pods.Items)).Should(gomega.BeNumerically(">=", 1))
7473

7574
t.dnsPod = &pods.Items[0]
76-
e2elog.Logf("Using DNS pod: %v", t.dnsPod.Name)
75+
framework.Logf("Using DNS pod: %v", t.dnsPod.Name)
7776

7877
if strings.Contains(t.dnsPod.Name, "coredns") {
7978
t.name = "coredns"
@@ -101,7 +100,7 @@ func (t *dnsTestCommon) checkDNSRecordFrom(name string, predicate func([]string)
101100
})
102101

103102
if err != nil {
104-
e2elog.Failf("dig result did not match: %#v after %v",
103+
framework.Failf("dig result did not match: %#v after %v",
105104
actual, timeout)
106105
}
107106
}
@@ -134,7 +133,7 @@ func (t *dnsTestCommon) runDig(dnsName, target string) []string {
134133
CaptureStderr: true,
135134
})
136135

137-
e2elog.Logf("Running dig: %v, stdout: %q, stderr: %q, err: %v",
136+
framework.Logf("Running dig: %v, stdout: %q, stderr: %q, err: %v",
138137
cmd, stdout, stderr, err)
139138

140139
if stdout == "" {
@@ -226,7 +225,7 @@ func (t *dnsTestCommon) createUtilPodLabel(baseName string) {
226225
var err error
227226
t.utilPod, err = t.c.CoreV1().Pods(t.f.Namespace.Name).Create(t.utilPod)
228227
framework.ExpectNoError(err, "failed to create pod: %v", t.utilPod)
229-
e2elog.Logf("Created pod %v", t.utilPod)
228+
framework.Logf("Created pod %v", t.utilPod)
230229
err = t.f.WaitForPodRunning(t.utilPod.Name)
231230
framework.ExpectNoError(err, "pod failed to start running: %v", t.utilPod)
232231

@@ -252,13 +251,13 @@ func (t *dnsTestCommon) createUtilPodLabel(baseName string) {
252251

253252
t.utilService, err = t.c.CoreV1().Services(t.f.Namespace.Name).Create(t.utilService)
254253
framework.ExpectNoError(err, "failed to create service: %s/%s", t.f.Namespace.Name, t.utilService.ObjectMeta.Name)
255-
e2elog.Logf("Created service %v", t.utilService)
254+
framework.Logf("Created service %v", t.utilService)
256255
}
257256

258257
func (t *dnsTestCommon) deleteUtilPod() {
259258
podClient := t.c.CoreV1().Pods(t.f.Namespace.Name)
260259
if err := podClient.Delete(t.utilPod.Name, metav1.NewDeleteOptions(0)); err != nil {
261-
e2elog.Logf("Delete of pod %v/%v failed: %v",
260+
framework.Logf("Delete of pod %v/%v failed: %v",
262261
t.utilPod.Namespace, t.utilPod.Name, err)
263262
}
264263
}
@@ -318,7 +317,7 @@ func (t *dnsTestCommon) createDNSPodFromObj(pod *v1.Pod) {
318317
var err error
319318
t.dnsServerPod, err = t.c.CoreV1().Pods(t.f.Namespace.Name).Create(t.dnsServerPod)
320319
framework.ExpectNoError(err, "failed to create pod: %v", t.dnsServerPod)
321-
e2elog.Logf("Created pod %v", t.dnsServerPod)
320+
framework.Logf("Created pod %v", t.dnsServerPod)
322321
err = t.f.WaitForPodRunning(t.dnsServerPod.Name)
323322
framework.ExpectNoError(err, "pod failed to start running: %v", t.dnsServerPod)
324323

@@ -373,7 +372,7 @@ func (t *dnsTestCommon) createDNSServerWithPtrRecord(isIPv6 bool) {
373372
func (t *dnsTestCommon) deleteDNSServerPod() {
374373
podClient := t.c.CoreV1().Pods(t.f.Namespace.Name)
375374
if err := podClient.Delete(t.dnsServerPod.Name, metav1.NewDeleteOptions(0)); err != nil {
376-
e2elog.Logf("Delete of pod %v/%v failed: %v",
375+
framework.Logf("Delete of pod %v/%v failed: %v",
377376
t.utilPod.Namespace, t.dnsServerPod.Name, err)
378377
}
379378
}
@@ -495,7 +494,7 @@ func createProbeCommand(namesToResolve []string, hostEntries []string, ptrLookup
495494
if len(ptrLookupIP) > 0 {
496495
ptrLookup, err := dnsutil.ReverseAddr(ptrLookupIP)
497496
if err != nil {
498-
e2elog.Failf("Unable to obtain reverse IP address record from IP %s: %v", ptrLookupIP, err)
497+
framework.Failf("Unable to obtain reverse IP address record from IP %s: %v", ptrLookupIP, err)
499498
}
500499
ptrRecByUDPFileName := fmt.Sprintf("%s_udp@PTR", ptrLookupIP)
501500
ptrRecByTCPFileName := fmt.Sprintf("%s_tcp@PTR", ptrLookupIP)
@@ -542,20 +541,20 @@ func assertFilesContain(fileNames []string, fileDir string, pod *v1.Pod, client
542541

543542
if err != nil {
544543
if ctx.Err() != nil {
545-
e2elog.Failf("Unable to read %s from pod %s/%s: %v", fileName, pod.Namespace, pod.Name, err)
544+
framework.Failf("Unable to read %s from pod %s/%s: %v", fileName, pod.Namespace, pod.Name, err)
546545
} else {
547-
e2elog.Logf("Unable to read %s from pod %s/%s: %v", fileName, pod.Namespace, pod.Name, err)
546+
framework.Logf("Unable to read %s from pod %s/%s: %v", fileName, pod.Namespace, pod.Name, err)
548547
}
549548
failed = append(failed, fileName)
550549
} else if check && strings.TrimSpace(string(contents)) != expected {
551-
e2elog.Logf("File %s from pod %s/%s contains '%s' instead of '%s'", fileName, pod.Namespace, pod.Name, string(contents), expected)
550+
framework.Logf("File %s from pod %s/%s contains '%s' instead of '%s'", fileName, pod.Namespace, pod.Name, string(contents), expected)
552551
failed = append(failed, fileName)
553552
}
554553
}
555554
if len(failed) == 0 {
556555
return true, nil
557556
}
558-
e2elog.Logf("Lookups using %s/%s failed for: %v\n", pod.Namespace, pod.Name, failed)
557+
framework.Logf("Lookups using %s/%s failed for: %v\n", pod.Namespace, pod.Name, failed)
559558
return false, nil
560559
}))
561560
framework.ExpectEqual(len(failed), 0)
@@ -570,23 +569,23 @@ func validateDNSResults(f *framework.Framework, pod *v1.Pod, fileNames []string)
570569
podClient.Delete(pod.Name, metav1.NewDeleteOptions(0))
571570
}()
572571
if _, err := podClient.Create(pod); err != nil {
573-
e2elog.Failf("ginkgo.Failed to create pod %s/%s: %v", pod.Namespace, pod.Name, err)
572+
framework.Failf("ginkgo.Failed to create pod %s/%s: %v", pod.Namespace, pod.Name, err)
574573
}
575574

576575
framework.ExpectNoError(f.WaitForPodRunning(pod.Name))
577576

578577
ginkgo.By("retrieving the pod")
579578
pod, err := podClient.Get(pod.Name, metav1.GetOptions{})
580579
if err != nil {
581-
e2elog.Failf("ginkgo.Failed to get pod %s/%s: %v", pod.Namespace, pod.Name, err)
580+
framework.Failf("ginkgo.Failed to get pod %s/%s: %v", pod.Namespace, pod.Name, err)
582581
}
583582
// Try to find results for each expected name.
584583
ginkgo.By("looking for the results for each expected name from probers")
585584
assertFilesExist(fileNames, "results", pod, f.ClientSet)
586585

587586
// TODO: probe from the host, too.
588587

589-
e2elog.Logf("DNS probes using %s/%s succeeded\n", pod.Namespace, pod.Name)
588+
framework.Logf("DNS probes using %s/%s succeeded\n", pod.Namespace, pod.Name)
590589
}
591590

592591
func validateTargetedProbeOutput(f *framework.Framework, pod *v1.Pod, fileNames []string, value string) {
@@ -598,21 +597,21 @@ func validateTargetedProbeOutput(f *framework.Framework, pod *v1.Pod, fileNames
598597
podClient.Delete(pod.Name, metav1.NewDeleteOptions(0))
599598
}()
600599
if _, err := podClient.Create(pod); err != nil {
601-
e2elog.Failf("ginkgo.Failed to create pod %s/%s: %v", pod.Namespace, pod.Name, err)
600+
framework.Failf("ginkgo.Failed to create pod %s/%s: %v", pod.Namespace, pod.Name, err)
602601
}
603602

604603
framework.ExpectNoError(f.WaitForPodRunning(pod.Name))
605604

606605
ginkgo.By("retrieving the pod")
607606
pod, err := podClient.Get(pod.Name, metav1.GetOptions{})
608607
if err != nil {
609-
e2elog.Failf("ginkgo.Failed to get pod %s/%s: %v", pod.Namespace, pod.Name, err)
608+
framework.Failf("ginkgo.Failed to get pod %s/%s: %v", pod.Namespace, pod.Name, err)
610609
}
611610
// Try to find the expected value for each expected name.
612611
ginkgo.By("looking for the results for each expected name from probers")
613612
assertFilesContain(fileNames, "results", pod, f.ClientSet, true, value)
614613

615-
e2elog.Logf("DNS probes using %s succeeded\n", pod.Name)
614+
framework.Logf("DNS probes using %s succeeded\n", pod.Name)
616615
}
617616

618617
func reverseArray(arr []string) []string {

‎test/e2e/network/dns_scale_records.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"k8s.io/apimachinery/pkg/util/wait"
2828
"k8s.io/client-go/util/workqueue"
2929
"k8s.io/kubernetes/test/e2e/framework"
30-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3130
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
3231
testutils "k8s.io/kubernetes/test/utils"
3332

@@ -68,7 +67,7 @@ var _ = SIGDescribe("[Feature:PerformanceDNS][Serial]", func() {
6867
defer ginkgo.GinkgoRecover()
6968
framework.ExpectNoError(testutils.CreateServiceWithRetries(f.ClientSet, services[i].Namespace, services[i]))
7069
}
71-
e2elog.Logf("Creating %v test services", maxServicesPerCluster)
70+
framework.Logf("Creating %v test services", maxServicesPerCluster)
7271
workqueue.ParallelizeUntil(context.TODO(), parallelCreateServiceWorkers, len(services), createService)
7372
dnsTest := dnsTestCommon{
7473
f: f,
@@ -77,7 +76,7 @@ var _ = SIGDescribe("[Feature:PerformanceDNS][Serial]", func() {
7776
}
7877
dnsTest.createUtilPodLabel("e2e-dns-scale-records")
7978
defer dnsTest.deleteUtilPod()
80-
e2elog.Logf("Querying %v%% of service records", checkServicePercent*100)
79+
framework.Logf("Querying %v%% of service records", checkServicePercent*100)
8180
for i := 0; i < len(services); i++ {
8281
if i%(1/checkServicePercent) != 0 {
8382
continue
@@ -86,7 +85,7 @@ var _ = SIGDescribe("[Feature:PerformanceDNS][Serial]", func() {
8685
svc, err := f.ClientSet.CoreV1().Services(s.Namespace).Get(s.Name, metav1.GetOptions{})
8786
framework.ExpectNoError(err)
8887
qname := fmt.Sprintf("%v.%v.svc.%v", s.Name, s.Namespace, framework.TestContext.ClusterDNSDomain)
89-
e2elog.Logf("Querying %v expecting %v", qname, svc.Spec.ClusterIP)
88+
framework.Logf("Querying %v expecting %v", qname, svc.Spec.ClusterIP)
9089
dnsTest.checkDNSRecordFrom(
9190
qname,
9291
func(actual []string) bool {

‎test/e2e/network/dual_stack.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
clientset "k8s.io/client-go/kubernetes"
3030
"k8s.io/kubernetes/test/e2e/framework"
3131
e2edeploy "k8s.io/kubernetes/test/e2e/framework/deployment"
32-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3332
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
3433
imageutils "k8s.io/kubernetes/test/utils/image"
3534
)
@@ -126,7 +125,7 @@ var _ = SIGDescribe("[Feature:IPv6DualStackAlphaFeature] [LinuxOnly]", func() {
126125
gomega.Expect(nodeList).NotTo(gomega.BeNil())
127126

128127
if len(nodeList.Items) < 1 {
129-
e2elog.Failf("Expect at least 1 node, got %v", len(nodeList.Items))
128+
framework.Failf("Expect at least 1 node, got %v", len(nodeList.Items))
130129
}
131130

132131
replicas := int32(len(nodeList.Items))
@@ -216,10 +215,10 @@ func assertNetworkConnectivity(f *framework.Framework, serverPods v1.PodList, cl
216215
var serverIPs []string
217216
for _, pod := range serverPods.Items {
218217
if pod.Status.PodIPs == nil || len(pod.Status.PodIPs) != 2 {
219-
e2elog.Failf("PodIPs list not expected value, got %v", pod.Status.PodIPs)
218+
framework.Failf("PodIPs list not expected value, got %v", pod.Status.PodIPs)
220219
}
221220
if isIPv4(pod.Status.PodIPs[0].IP) == isIPv4(pod.Status.PodIPs[1].IP) {
222-
e2elog.Failf("PodIPs should belong to different families, got %v", pod.Status.PodIPs)
221+
framework.Failf("PodIPs should belong to different families, got %v", pod.Status.PodIPs)
223222
}
224223
serverIPs = append(serverIPs, pod.Status.PodIPs[0].IP, pod.Status.PodIPs[1].IP)
225224
}

‎test/e2e/network/example_cluster_dns.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import (
3131
clientset "k8s.io/client-go/kubernetes"
3232
api "k8s.io/kubernetes/pkg/apis/core"
3333
"k8s.io/kubernetes/test/e2e/framework"
34-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3534
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3635
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
3736
)
@@ -109,7 +108,7 @@ var _ = SIGDescribe("ClusterDns [Feature:Example]", func() {
109108
framework.ExpectNoError(err, "failed to list pods in namespace: %s", ns.Name)
110109
err = e2epod.PodsResponding(c, ns.Name, backendPodName, false, pods)
111110
framework.ExpectNoError(err, "waiting for all pods to respond")
112-
e2elog.Logf("found %d backend pods responding in namespace %s", len(pods.Items), ns.Name)
111+
framework.Logf("found %d backend pods responding in namespace %s", len(pods.Items), ns.Name)
113112

114113
err = e2eservice.WaitForServiceResponding(c, ns.Name, backendSvcName)
115114
framework.ExpectNoError(err, "waiting for the service to respond")
@@ -128,7 +127,7 @@ var _ = SIGDescribe("ClusterDns [Feature:Example]", func() {
128127
pods, err := c.CoreV1().Pods(namespaces[0].Name).List(options)
129128

130129
if err != nil || pods == nil || len(pods.Items) == 0 {
131-
e2elog.Failf("no running pods found")
130+
framework.Failf("no running pods found")
132131
}
133132
podName := pods.Items[0].Name
134133

0 commit comments

Comments
 (0)