Skip to content

Commit 224ac7a

Browse files
committed
debug
Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
1 parent b7281ed commit 224ac7a

File tree

1 file changed

+27
-19
lines changed

1 file changed

+27
-19
lines changed

test/e2e/kube-ovn/underlay/underlay.go

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
dockernetwork "github.com/docker/docker/api/types/network"
1414
corev1 "k8s.io/api/core/v1"
1515
clientset "k8s.io/client-go/kubernetes"
16+
"k8s.io/kubectl/pkg/util/podutils"
1617
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
1718
e2epodoutput "k8s.io/kubernetes/test/e2e/framework/pod/output"
1819

@@ -535,24 +536,31 @@ var _ = framework.SerialDescribe("[group:underlay]", func() {
535536
pod.Spec.TerminationGracePeriodSeconds = nil
536537
_ = podClient.Create(pod)
537538

538-
ginkgo.By("Waiting for pod events")
539-
events := eventClient.WaitToHaveEvent("Pod", podName, "Warning", "FailedCreatePodSandBox", "kubelet", "")
540-
var message string
541-
if f.HasIPv4() {
542-
message = fmt.Sprintf("IP address %s has already been used by host with MAC %s", networkInfo.IPAddress, mac)
543-
} else {
544-
message = "dadfailed"
545-
}
546-
var found bool
547-
for _, event := range events {
548-
if strings.Contains(event.Message, message) {
549-
found = true
550-
framework.Logf("Found pod event: %s", event.Message)
551-
break
552-
}
553-
}
554-
555-
if !found {
539+
// ginkgo.By("Waiting for pod events")
540+
// events := eventClient.WaitToHaveEvent("Pod", podName, "Warning", "FailedCreatePodSandBox", "kubelet", "")
541+
// var message string
542+
// if f.HasIPv4() {
543+
// message = fmt.Sprintf("IP address %s has already been used by host with MAC %s", networkInfo.IPAddress, mac)
544+
// } else {
545+
// message = "dadfailed"
546+
// }
547+
// var found bool
548+
// for _, event := range events {
549+
// if strings.Contains(event.Message, message) {
550+
// found = true
551+
// framework.Logf("Found pod event: %s", event.Message)
552+
// break
553+
// }
554+
// }
555+
556+
_ = eventClient
557+
_ = mac
558+
559+
ginkgo.By("Waiting 1 minute")
560+
time.Sleep(time.Minute)
561+
562+
pod = podClient.GetPod(podName)
563+
if podutils.IsPodReady(pod) {
556564
ginkgo.By("Getting ip addresses and routes of container " + containerName)
557565
links, err := iproute.AddressShow("eth0", func(cmd ...string) ([]byte, []byte, error) {
558566
return docker.Exec(containerID, nil, cmd...)
@@ -564,8 +572,8 @@ var _ = framework.SerialDescribe("[group:underlay]", func() {
564572
})
565573
framework.ExpectNoError(err)
566574
framework.Logf("routes of container:\n%s", format.Object(routes, 2))
575+
framework.Failf("pod %s should not be ready", podName)
567576
}
568-
framework.ExpectTrue(found, "Address conflict should be reported in pod events")
569577
})
570578

571579
framework.ConformanceIt("should support underlay to overlay subnet interconnection", func() {

0 commit comments

Comments
 (0)