From 416cc7727ff85ec01c1a4260d857ced651a4730c Mon Sep 17 00:00:00 2001
From: changluyi <47097611+changluyi@users.noreply.github.com>
Date: Mon, 20 Mar 2023 14:13:12 +0800
Subject: [PATCH] when restart deployment kube-ovn-controller the kubectl ko
 log loss (#2508)

* when restart deployment kube-ovn-controller the kubectl ko log loss

* fix
---
 test/e2e/framework/deployment.go       | 13 +++++++++++++
 test/e2e/kube-ovn/underlay/underlay.go |  4 +---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/test/e2e/framework/deployment.go b/test/e2e/framework/deployment.go
index d4bd5832912..07dc68eb4df 100644
--- a/test/e2e/framework/deployment.go
+++ b/test/e2e/framework/deployment.go
@@ -3,6 +3,7 @@ package framework
 import (
 	"context"
 	"fmt"
+	"os/exec"
 	"time"
 
 	appsv1 "k8s.io/api/apps/v1"
@@ -118,3 +119,15 @@ func MakeDeployment(name string, replicas int32, podLabels, podAnnotations map[s
 	deploy.Spec.Template.Annotations = podAnnotations
 	return deploy
 }
+
+func RestartSystemDeployment(name string, enableLog bool) {
+	if enableLog {
+		output, err := exec.Command("bash", "-c", fmt.Sprintf("kubectl ko log kube-ovn %s all", name)).CombinedOutput()
+		framework.ExpectNoError(err, fmt.Sprintf("dump all %s log failed", name))
+		framework.Logf(string(output))
+	}
+
+	restartCmd := fmt.Sprintf("kubectl rollout restart deployment %s -n kube-system", name)
+	_, err := exec.Command("bash", "-c", restartCmd).CombinedOutput()
+	framework.ExpectNoError(err, fmt.Sprintf("restart %s failed", name))
+}
diff --git a/test/e2e/kube-ovn/underlay/underlay.go b/test/e2e/kube-ovn/underlay/underlay.go
index 99b4af2caa5..d312c440c73 100644
--- a/test/e2e/kube-ovn/underlay/underlay.go
+++ b/test/e2e/kube-ovn/underlay/underlay.go
@@ -543,9 +543,7 @@ var _ = framework.SerialDescribe("[group:underlay]", func() {
 		checkU2OItems(true, subnet, underlayPod, overlayPod)
 
 		ginkgo.By("step4: check if kube-ovn-controller restart")
-		restartCmd := "kubectl rollout restart deployment kube-ovn-controller -n kube-system"
-		_, err = exec.Command("bash", "-c", restartCmd).CombinedOutput()
-		framework.ExpectNoError(err, "restart kube-ovn-controller")
+		framework.RestartSystemDeployment("kube-ovn-controller", true)
 		checkU2OItems(true, subnet, underlayPod, overlayPod)
 
 		ginkgo.By("step5: Disable u2o check after restart kube-controller")