fix port forwarding

Author: salonichf5

tests/suite/graceful_recovery_test.go

@@ -26,6 +26,14 @@ const (
 	ngfContainerName   = "nginx-gateway"
 )
 
+var (
+	baseHttpURL  = "http://cafe.example.com"
+	baseHttpsURL = "https://cafe.example.com"
+	teaURL       = baseHttpsURL + "/tea"
+	coffeeURL    = baseHttpURL + "/coffee"
+	ngfPodName   string
+)
+
 // Since checkContainerLogsForErrors may experience interference from previous tests (as explained in the function
 // documentation), this test is recommended to be run separate from other nfr tests.
 var _ = Describe("Graceful Recovery test", Ordered, Label("functional", "graceful-recovery"), func() {
@@ -42,11 +50,6 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("functional", "gracefu
 		},
 	}
 
-	baseHttpURL := "http://cafe.example.com"
-	baseHttpsURL := "https://cafe.example.com"
-	teaURL := baseHttpsURL + "/tea"
-	coffeeURL := baseHttpURL + "/coffee"
-
 	var ngfPodName string
 
 	BeforeAll(func() {
@@ -61,6 +64,8 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("functional", "gracefu
 		Expect(err).ToNot(HaveOccurred())
 		Expect(podNames).To(HaveLen(1))
 
+		startPortForwarding(serviceType, ngfNamespace, podNames)
+
 		ngfPodName = podNames[0]
 		if portFwdPort != 0 {
 			coffeeURL = fmt.Sprintf("%s:%d/coffee", baseHttpURL, portFwdPort)
@@ -115,6 +120,8 @@ func runRecoveryTest(teaURL, coffeeURL, ngfPodName, containerName string, files
 		Expect(err).ToNot(HaveOccurred())
 	}
 
+	portFwdPort = 0
+	close(portForwardStopCh)
 	restartContainer(ngfPodName, containerName)
 
 	if containerName != nginxContainerName {
@@ -127,6 +134,8 @@ func runRecoveryTest(teaURL, coffeeURL, ngfPodName, containerName string, files
 			Should(Succeed())
 	}
 
+	startPortForwarding(serviceType, ngfNamespace, []string{ngfPodName})
+
 	Eventually(
 		func() error {
 			return checkForWorkingTraffic(teaURL, coffeeURL)
@@ -359,7 +368,8 @@ func runNodeDebuggerJob(ngfPodName, jobScript string) (*v1.Job, error) {
 			len(job.Spec.Template.Spec.Containers),
 		)
 	}
-	job.Spec.Template.Spec.Containers[0].Args = []string{jobScript}
+	portScript := "kill $(lsof -t -i:10443,10080)"
+	job.Spec.Template.Spec.Containers[0].Args = []string{jobScript, portScript}
 	job.Namespace = ngfNamespace
 
 	if err = resourceManager.Apply([]client.Object{job}); err != nil {

tests/suite/system_suite_test.go

@@ -24,6 +24,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/rest"
 	ctlr "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
@@ -75,6 +76,7 @@ var (
 	version           string
 	clusterInfo       framework.ClusterInfo
 	skipNFRTests      bool
+	k8sConfig         *rest.Config
 )
 
 const (
@@ -96,7 +98,7 @@ type setupConfig struct {
 func setup(cfg setupConfig, extraInstallArgs ...string) {
 	log.SetLogger(GinkgoLogr)
 
-	k8sConfig := ctlr.GetConfigOrDie()
+	k8sConfig = ctlr.GetConfigOrDie()
 	scheme := k8sRuntime.NewScheme()
 	Expect(core.AddToScheme(scheme)).To(Succeed())
 	Expect(apps.AddToScheme(scheme)).To(Succeed())
@@ -184,16 +186,26 @@ func setup(cfg setupConfig, extraInstallArgs ...string) {
 	)
 	Expect(err).ToNot(HaveOccurred())
 	Expect(podNames).ToNot(BeEmpty())
+	fmt.Println("service type: ", *serviceType)
 
+	labels := GinkgoLabelFilter()
+	if !strings.Contains(labels, "graceful-recovery") {
+		startPortForwarding(serviceType, installCfg.Namespace, podNames)
+	}
+}
+
+func startPortForwarding(serviceType *string, namespace string, podNames []string) {
+	var err error
 	if *serviceType != "LoadBalancer" {
+		fmt.Println("port forwarding....")
 		ports := []string{fmt.Sprintf("%d:80", ngfHTTPForwardedPort), fmt.Sprintf("%d:443", ngfHTTPSForwardedPort)}
 		portForwardStopCh = make(chan struct{})
-		err = framework.PortForward(k8sConfig, installCfg.Namespace, podNames[0], ports, portForwardStopCh)
+		err = framework.PortForward(k8sConfig, namespace, podNames[0], ports, portForwardStopCh)
 		address = "127.0.0.1"
 		portFwdPort = ngfHTTPForwardedPort
 		portFwdHTTPSPort = ngfHTTPSForwardedPort
 	} else {
-		address, err = resourceManager.GetLBIPAddress(installCfg.Namespace)
+		address, err = resourceManager.GetLBIPAddress(namespace)
 	}
 	Expect(err).ToNot(HaveOccurred())
 }