From 44b15f519a639cd5069f284bf3b302a966635916 Mon Sep 17 00:00:00 2001
From: Jacob Bohanon <jacob.bohanon@solo.io>
Date: Fri, 14 Jun 2024 16:01:04 -0400
Subject: [PATCH 01/35] yoink some stuff from old PR

---
 .../v1.18.0-beta1/port-forward-safety.yaml    | 13 +++++++++
 pkg/utils/kubeutils/pods.go                   |  2 +-
 .../kubeutils/portforward/api_forwarder.go    | 13 ++++++++-
 .../portforward/cli_portforwarder.go          | 13 ++++++++-
 .../kubeutils/portforward/portforwarder.go    |  3 +-
 projects/gloo/cli/pkg/cmd/gateway/dump.go     | 29 ++++++++++---------
 test/kubernetes/e2e/test.go                   | 17 +++++++++--
 7 files changed, 71 insertions(+), 19 deletions(-)
 create mode 100644 changelog/v1.18.0-beta1/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta1/port-forward-safety.yaml b/changelog/v1.18.0-beta1/port-forward-safety.yaml
new file mode 100644
index 00000000000..3a902625112
--- /dev/null
+++ b/changelog/v1.18.0-beta1/port-forward-safety.yaml
@@ -0,0 +1,13 @@
+changelog:
+  - type: NON_USER_FACING
+    issueLink: https://github.com/solo-io/gloo/issues/9353
+    resolvesIssue: false
+    description: >-
+      Add remote command type to facilitate executing commands in a pod. Additionally we are getting
+      away from using port forwards in E2E tests meant to emulate user behavior
+  - type: NON_USER_FACING
+    issueLink: https://github.com/solo-io/gloo/issues/9353
+    resolvesIssue: false
+    description: >-
+      Add safety around port forward util to ensure the port forward can be dialed
+      before returning nil.
diff --git a/pkg/utils/kubeutils/pods.go b/pkg/utils/kubeutils/pods.go
index 1cff3dcd89d..db03567f971 100644
--- a/pkg/utils/kubeutils/pods.go
+++ b/pkg/utils/kubeutils/pods.go
@@ -49,7 +49,7 @@ func GetReadyPodsForDeployment(
 	readyPodPredicate := func(pod corev1.Pod) bool {
 		for _, condition := range pod.Status.Conditions {
 			if condition.Type == corev1.PodReady {
-				return true
+				return condition.Status == corev1.ConditionTrue
 			}
 		}
 		return false
diff --git a/pkg/utils/kubeutils/portforward/api_forwarder.go b/pkg/utils/kubeutils/portforward/api_forwarder.go
index 385f68f100f..23d33888168 100644
--- a/pkg/utils/kubeutils/portforward/api_forwarder.go
+++ b/pkg/utils/kubeutils/portforward/api_forwarder.go
@@ -55,8 +55,19 @@ type apiPortForwarder struct {
 }
 
 func (f *apiPortForwarder) Start(ctx context.Context, options ...retry.Option) error {
-	return retry.Do(func() error {
+	if err := retry.Do(func() error {
 		return f.startOnce(ctx)
+	}, options...); err != nil {
+		return err
+	}
+	return retry.Do(func() error {
+		conn, err := net.Dial("tcp4", f.Address())
+		if err != nil {
+			return err
+		}
+		conn.Close()
+		return nil
+
 	}, options...)
 }
 
diff --git a/pkg/utils/kubeutils/portforward/cli_portforwarder.go b/pkg/utils/kubeutils/portforward/cli_portforwarder.go
index 0fe0b0c4589..c3e484c8831 100644
--- a/pkg/utils/kubeutils/portforward/cli_portforwarder.go
+++ b/pkg/utils/kubeutils/portforward/cli_portforwarder.go
@@ -38,8 +38,19 @@ type cliPortForwarder struct {
 }
 
 func (c *cliPortForwarder) Start(ctx context.Context, options ...retry.Option) error {
-	return retry.Do(func() error {
+	if err := retry.Do(func() error {
 		return c.startOnce(ctx)
+	}, options...); err != nil {
+		return err
+	}
+	return retry.Do(func() error {
+		conn, err := net.Dial("tcp4", c.Address())
+		if err != nil {
+			return err
+		}
+		conn.Close()
+		return nil
+
 	}, options...)
 }
 
diff --git a/pkg/utils/kubeutils/portforward/portforwarder.go b/pkg/utils/kubeutils/portforward/portforwarder.go
index 707e6bcb411..b96cd5b6ed2 100644
--- a/pkg/utils/kubeutils/portforward/portforwarder.go
+++ b/pkg/utils/kubeutils/portforward/portforwarder.go
@@ -12,7 +12,8 @@ import (
 // Implementations are NOT thread-safe, as the goroutine that Starts the PortForward
 // should also be the one that Closes it
 type PortForwarder interface {
-	// Start runs this PortForwarder.
+	// Start will attempt to open a port forward using the retry options provided. A nil return
+	// value indicates the port-forward succeeded and is safe to dial.
 	Start(ctx context.Context, options ...retry.Option) error
 
 	// Address returns the local forwarded address. Only valid while the apiPortForwarder is running.
diff --git a/projects/gloo/cli/pkg/cmd/gateway/dump.go b/projects/gloo/cli/pkg/cmd/gateway/dump.go
index 15955ac584a..cd18bbd7c45 100644
--- a/projects/gloo/cli/pkg/cmd/gateway/dump.go
+++ b/projects/gloo/cli/pkg/cmd/gateway/dump.go
@@ -6,14 +6,13 @@ import (
 	"io"
 	"log"
 	"net/http"
-	"os"
-	"os/exec"
-	"strconv"
 	"strings"
 	"time"
 
+	"github.com/avast/retry-go/v4"
 	"github.com/solo-io/go-utils/cliutils"
 
+	"github.com/solo-io/gloo/pkg/utils/kubeutils/portforward"
 	"github.com/solo-io/gloo/projects/gloo/cli/pkg/cmd/options"
 	"github.com/solo-io/gloo/projects/gloo/pkg/defaults"
 	"github.com/solo-io/solo-kit/pkg/errors"
@@ -43,19 +42,23 @@ func GetEnvoyAdminData(ctx context.Context, proxyName, namespace, path string, t
 	if !strings.HasPrefix(path, "/") {
 		path = "/" + path
 	}
-	adminPort := strconv.Itoa(int(defaults.EnvoyAdminPort))
-	portFwd := exec.Command("kubectl", "port-forward", "-n", namespace,
-		"deployment/"+proxyName, adminPort)
-	portFwd.Stdout = os.Stderr
-	portFwd.Stderr = os.Stderr
-	if err := portFwd.Start(); err != nil {
+
+	adminPort := int(defaults.EnvoyAdminPort)
+
+	pf := portforward.NewPortForwarder(portforward.WithDeployment(proxyName, namespace), portforward.WithPorts(adminPort, adminPort))
+	err := pf.Start(ctx,
+		retry.LastErrorOnly(true),
+		retry.Delay(100*time.Millisecond),
+		retry.DelayType(retry.BackOffDelay),
+		retry.Attempts(5))
+	if err != nil {
 		return "", errors.Wrapf(err, "failed to start port-forward")
 	}
 	defer func() {
-		if portFwd.Process != nil {
-			portFwd.Process.Kill()
-		}
+		pf.Close()
+		pf.WaitForStop()
 	}()
+
 	result := make(chan string)
 	errs := make(chan error)
 	go func() {
@@ -65,7 +68,7 @@ func GetEnvoyAdminData(ctx context.Context, proxyName, namespace, path string, t
 				return
 			default:
 			}
-			res, err := http.Get("http://localhost:" + adminPort + path)
+			res, err := http.Get("http://" + pf.Address() + path)
 			if err != nil {
 				errs <- err
 				time.Sleep(time.Millisecond * 250)
diff --git a/test/kubernetes/e2e/test.go b/test/kubernetes/e2e/test.go
index 4c0b5af5757..be4612fc9f5 100644
--- a/test/kubernetes/e2e/test.go
+++ b/test/kubernetes/e2e/test.go
@@ -183,8 +183,21 @@ func (i *TestInstallation) PreFailHandler(ctx context.Context) {
 	i.Assertions.Require.NoError(err)
 	defer glooLogFile.Close()
 
-	logsCmd := i.Actions.Kubectl().Command(ctx, "logs", "-n", i.Metadata.InstallNamespace, "deployments/gloo")
-	_ = logsCmd.WithStdout(glooLogFile).WithStderr(glooLogFile).Run()
+	glooLogsCmd := i.Actions.Kubectl().Command(ctx, "logs", "-n", i.Metadata.InstallNamespace, "deployments/gloo")
+	_ = glooLogsCmd.WithStdout(glooLogFile).WithStderr(glooLogFile).Run()
+
+	clusterStateFilePath := filepath.Join(i.GeneratedFiles.FailureDir, "cluster.log")
+	clusterStateFile, err := os.Create(clusterStateFilePath)
+	i.Assertions.Require.NoError(err)
+	defer clusterStateFile.Close()
+
+	clusterStateCmd := i.Actions.Kubectl().Command(ctx, "get", "all", "--all-namespaces", "-owide")
+	_ = clusterStateCmd.WithStdout(clusterStateFile).WithStderr(clusterStateFile).Run()
+
+	clusterStateFile.Write([]byte{'\n'})
+
+	gatewayStateCmd := i.Actions.Kubectl().Command(ctx, "get", "gtw", "--all-namespaces", "-owide")
+	_ = gatewayStateCmd.WithStdout(clusterStateFile).WithStderr(clusterStateFile).Run()
 }
 
 // GeneratedFiles is a collection of files that are generated during the execution of a set of tests

From 41a76942231381701e369463090a751ae52b46a9 Mon Sep 17 00:00:00 2001
From: Jacob Bohanon <jacob.bohanon@solo.io>
Date: Mon, 17 Jun 2024 07:54:57 -0400
Subject: [PATCH 02/35] add deletion check to ready pod getter

---
 pkg/utils/kubeutils/pods.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkg/utils/kubeutils/pods.go b/pkg/utils/kubeutils/pods.go
index db03567f971..6568072c93e 100644
--- a/pkg/utils/kubeutils/pods.go
+++ b/pkg/utils/kubeutils/pods.go
@@ -45,13 +45,21 @@ func GetReadyPodsForDeployment(
 	kubeClient *kubernetes.Clientset,
 	deploy metav1.ObjectMeta,
 ) ([]string, error) {
-	// This predicate will return true if and only if the pod is ready
+	// This predicate will return true if and only if the pod is ready.
 	readyPodPredicate := func(pod corev1.Pod) bool {
+
+		// Make sure our pod has not been marked for deletion.
+		if pod.DeletionTimestamp != nil {
+			return false
+		}
+
+		// Make sure the condition named "Ready" has the status "True".
 		for _, condition := range pod.Status.Conditions {
 			if condition.Type == corev1.PodReady {
 				return condition.Status == corev1.ConditionTrue
 			}
 		}
+
 		return false
 	}
 

From 94b4d405f07a34b19afe5d7f9ca8bbd564ddaef0 Mon Sep 17 00:00:00 2001
From: Jacob Bohanon <jacob.bohanon@solo.io>
Date: Mon, 17 Jun 2024 07:57:39 -0400
Subject: [PATCH 03/35] doctor changelog

---
 changelog/v1.18.0-beta1/port-forward-safety.yaml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/changelog/v1.18.0-beta1/port-forward-safety.yaml b/changelog/v1.18.0-beta1/port-forward-safety.yaml
index 3a902625112..d02a0361ae0 100644
--- a/changelog/v1.18.0-beta1/port-forward-safety.yaml
+++ b/changelog/v1.18.0-beta1/port-forward-safety.yaml
@@ -1,10 +1,4 @@
 changelog:
-  - type: NON_USER_FACING
-    issueLink: https://github.com/solo-io/gloo/issues/9353
-    resolvesIssue: false
-    description: >-
-      Add remote command type to facilitate executing commands in a pod. Additionally we are getting
-      away from using port forwards in E2E tests meant to emulate user behavior
   - type: NON_USER_FACING
     issueLink: https://github.com/solo-io/gloo/issues/9353
     resolvesIssue: false

From 443436372e77797a5dc76bab3d6d746fd4d92442 Mon Sep 17 00:00:00 2001
From: Jacob Bohanon <jacob.bohanon@solo.io>
Date: Mon, 17 Jun 2024 07:59:06 -0400
Subject: [PATCH 04/35] update portforwarders

---
 pkg/utils/kubeutils/kubectl/cli.go              |  1 +
 .../kubeutils/portforward/api_forwarder.go      |  5 +++++
 .../kubeutils/portforward/cli_portforwarder.go  | 15 +++++++++++++++
 test/gomega/assertions/stats.go                 | 14 --------------
 test/kubernetes/e2e/features/deployer/suite.go  | 17 ++++++-----------
 5 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/pkg/utils/kubeutils/kubectl/cli.go b/pkg/utils/kubeutils/kubectl/cli.go
index b07576e2a73..be835bd46a1 100644
--- a/pkg/utils/kubeutils/kubectl/cli.go
+++ b/pkg/utils/kubeutils/kubectl/cli.go
@@ -183,6 +183,7 @@ func (c *Cli) StartPortForward(ctx context.Context, options ...portforward.Optio
 		portforward.WithKubeContext(c.kubeContext),
 	}, options...)
 
+	// We use the Cli PortForwarder because this util is explicitly designed to be a convenience wrapper around kubectl
 	portForwarder := portforward.NewCliPortForwarder(options...)
 	err := portForwarder.Start(
 		ctx,
diff --git a/pkg/utils/kubeutils/portforward/api_forwarder.go b/pkg/utils/kubeutils/portforward/api_forwarder.go
index 23d33888168..3eee405721b 100644
--- a/pkg/utils/kubeutils/portforward/api_forwarder.go
+++ b/pkg/utils/kubeutils/portforward/api_forwarder.go
@@ -55,11 +55,16 @@ type apiPortForwarder struct {
 }
 
 func (f *apiPortForwarder) Start(ctx context.Context, options ...retry.Option) error {
+	// First we attempt to start the port-forward following the retry options provided.
 	if err := retry.Do(func() error {
 		return f.startOnce(ctx)
 	}, options...); err != nil {
 		return err
 	}
+
+	// Before returning nil, we make sure the port-forward can be dialed on the
+	// port-forward address configured. This prevents us returning nil while the
+	// port-forward is still initializing.
 	return retry.Do(func() error {
 		conn, err := net.Dial("tcp4", f.Address())
 		if err != nil {
diff --git a/pkg/utils/kubeutils/portforward/cli_portforwarder.go b/pkg/utils/kubeutils/portforward/cli_portforwarder.go
index c3e484c8831..f090b964090 100644
--- a/pkg/utils/kubeutils/portforward/cli_portforwarder.go
+++ b/pkg/utils/kubeutils/portforward/cli_portforwarder.go
@@ -6,8 +6,11 @@ import (
 	"net"
 	"os/exec"
 	"strconv"
+	"strings"
+	"time"
 
 	errors "github.com/rotisserie/eris"
+	"github.com/solo-io/go-utils/testutils"
 
 	"github.com/avast/retry-go/v4"
 )
@@ -38,11 +41,16 @@ type cliPortForwarder struct {
 }
 
 func (c *cliPortForwarder) Start(ctx context.Context, options ...retry.Option) error {
+	// First we attempt to start the port-forward following the retry options provided.
 	if err := retry.Do(func() error {
 		return c.startOnce(ctx)
 	}, options...); err != nil {
 		return err
 	}
+
+	// Before returning nil, we make sure the port-forward can be dialed on the
+	// port-forward address configured. This prevents us returning nil while the
+	// port-forward is still initializing.
 	return retry.Do(func() error {
 		conn, err := net.Dial("tcp4", c.Address())
 		if err != nil {
@@ -66,6 +74,13 @@ func (c *cliPortForwarder) startOnce(ctx context.Context) error {
 
 	cmdCtx, cmdCancel := context.WithCancel(ctx)
 
+	if strings.Contains(c.properties.resourceType, "deploy") || strings.Contains(c.properties.resourceType, "pod") {
+		if err := testutils.WaitPodsRunning(ctx, time.Millisecond*100, c.properties.resourceNamespace, fmt.Sprintf("gloo=%s", c.properties.resourceName)); err != nil {
+			cmdCancel()
+			return err
+		}
+	}
+
 	c.cmd = exec.CommandContext(
 		cmdCtx,
 		"kubectl",
diff --git a/test/gomega/assertions/stats.go b/test/gomega/assertions/stats.go
index 5fe61be16a7..e5cc98d6b1c 100644
--- a/test/gomega/assertions/stats.go
+++ b/test/gomega/assertions/stats.go
@@ -77,20 +77,6 @@ func EventuallyWithOffsetStatisticsMatchAssertions(offset int, statsPortFwd Stat
 		portForwarder.WaitForStop()
 	}()
 
-	By("Ensure port-forward is open before performing assertions")
-	statsRequest, err := http.NewRequest(http.MethodGet, fmt.Sprintf("http://localhost:%d/", statsPortFwd.LocalPort), nil)
-	ExpectWithOffset(offset+1, err).NotTo(HaveOccurred())
-	EventuallyWithOffset(offset+1, func(g Gomega) {
-		resp, err := http.DefaultClient.Do(statsRequest)
-		g.Expect(err).NotTo(HaveOccurred())
-		defer resp.Body.Close()
-		g.Expect(resp).To(matchers.HaveHttpResponse(&matchers.HttpResponse{
-			StatusCode: http.StatusOK,
-			Body:       Not(BeEmpty()),
-		}))
-	}).Should(Succeed())
-
-	By("Perform the assertions while the port forward is open")
 	for _, assertion := range assertions {
 		assertion.WithOffset(offset + 1).ShouldNot(HaveOccurred())
 	}
diff --git a/test/kubernetes/e2e/features/deployer/suite.go b/test/kubernetes/e2e/features/deployer/suite.go
index d351fbe8dc8..1f83036d799 100644
--- a/test/kubernetes/e2e/features/deployer/suite.go
+++ b/test/kubernetes/e2e/features/deployer/suite.go
@@ -18,7 +18,6 @@ import (
 	"github.com/solo-io/gloo/projects/gloo/pkg/syncer/setup"
 	"github.com/solo-io/gloo/test/helpers"
 	"github.com/solo-io/gloo/test/kubernetes/e2e"
-	"github.com/solo-io/gloo/test/kubernetes/testutils/runtime"
 )
 
 // testingSuite is the entire Suite of tests for the "deployer" feature
@@ -73,16 +72,12 @@ func (s *testingSuite) TestConfigureProxiesFromGatewayParameters() {
 	s.testInstallation.Assertions.EventuallyRunningReplicas(s.ctx, proxyDeployment.ObjectMeta, gomega.Equal(1))
 
 	// We assert that we can port-forward requests to the proxy deployment, and then execute requests against the server
-	if s.testInstallation.RuntimeContext.RunSource == runtime.LocalDevelopment {
-		// There are failures when opening port-forwards to the Envoy Admin API in CI
-		// Those are currently being investigated
-		s.testInstallation.Assertions.AssertEnvoyAdminApi(
-			s.ctx,
-			proxyDeployment.ObjectMeta,
-			serverInfoLogLevelAssertion(s.testInstallation, "debug", "connection:trace,upstream:debug"),
-			xdsClusterAssertion(s.testInstallation),
-		)
-	}
+	s.testInstallation.Assertions.AssertEnvoyAdminApi(
+		s.ctx,
+		proxyDeployment.ObjectMeta,
+		serverInfoLogLevelAssertion(s.testInstallation, "debug", "connection:trace,upstream:debug"),
+		xdsClusterAssertion(s.testInstallation),
+	)
 }
 
 func (s *testingSuite) TestSelfManagedGateway() {

From 4a234ee10b55ad04eae77dda497dc135c30ec652 Mon Sep 17 00:00:00 2001
From: Jacob Bohanon <jacob.bohanon@solo.io>
Date: Mon, 17 Jun 2024 07:59:18 -0400
Subject: [PATCH 05/35] default to api portforwarder

---
 pkg/utils/kubeutils/portforward/portforwarder.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/utils/kubeutils/portforward/portforwarder.go b/pkg/utils/kubeutils/portforward/portforwarder.go
index b96cd5b6ed2..548eb0eee55 100644
--- a/pkg/utils/kubeutils/portforward/portforwarder.go
+++ b/pkg/utils/kubeutils/portforward/portforwarder.go
@@ -33,5 +33,5 @@ type PortForwarder interface {
 
 // NewPortForwarder returns an implementation of a PortForwarder
 func NewPortForwarder(options ...Option) PortForwarder {
-	return NewCliPortForwarder(options...)
+	return NewApiPortForwarder(options...)
 }

From 27014da324965857a26d44d673c3e5207ac08f2c Mon Sep 17 00:00:00 2001
From: Jacob Bohanon <jacob.bohanon@solo.io>
Date: Mon, 17 Jun 2024 08:09:05 -0400
Subject: [PATCH 06/35] test port-forward

---
 test/kube2e/gloo/utils_test.go | 54 ++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 test/kube2e/gloo/utils_test.go

diff --git a/test/kube2e/gloo/utils_test.go b/test/kube2e/gloo/utils_test.go
new file mode 100644
index 00000000000..9dd4310db00
--- /dev/null
+++ b/test/kube2e/gloo/utils_test.go
@@ -0,0 +1,54 @@
+package gloo_test
+
+import (
+	"context"
+	"net"
+	"time"
+
+	"github.com/avast/retry-go/v4"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+
+	"github.com/solo-io/gloo/pkg/utils/kubeutils/portforward"
+)
+
+var _ = Describe("Utils", func() {
+
+	Context("portforward", func() {
+		var (
+			pf                  portforward.PortForwarder
+			ctx                 context.Context
+			cancel              context.CancelFunc
+			defaultRetryOptions = []retry.Option{
+				retry.LastErrorOnly(true),
+				retry.Delay(100 * time.Millisecond),
+				retry.DelayType(retry.BackOffDelay),
+				retry.Attempts(5),
+			}
+		)
+
+		AfterEach(func() {
+			cancel()
+			pf.Close()
+			pf.WaitForStop()
+		})
+
+		BeforeEach(func() {
+			ctx, cancel = context.WithCancel(context.Background())
+			// We are using kube-dns because we know we have a kubectl and a kind cluster on our CI
+			// env. If that ever changes we need to re-assess this test strategy.
+			// We are using port 30053 because 53 is privileged.
+			pf = portforward.NewPortForwarder(portforward.WithService("kube-dns", "kube-system"), portforward.WithPorts(30053, 53))
+		})
+
+		It("Creates a usable portforward with Start", func() {
+			err := pf.Start(ctx, defaultRetryOptions...)
+			Expect(err).ToNot(HaveOccurred())
+			_, err = net.Dial("tcp4", pf.Address())
+			Expect(err).ToNot(HaveOccurred())
+
+		})
+
+	})
+})

From 72de64e33d35197242434e4315d1e35a9f7ada9b Mon Sep 17 00:00:00 2001
From: Jacob Bohanon <jacob.bohanon@solo.io>
Date: Mon, 17 Jun 2024 08:29:35 -0400
Subject: [PATCH 07/35] update go-utils to select ready not terminating

---
 go.mod | 2 +-
 go.sum | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index 7712d2d16e7..16f7188b3e2 100644
--- a/go.mod
+++ b/go.mod
@@ -48,7 +48,7 @@ require (
 	github.com/saiskee/gettercheck v0.0.0-20210820204958-38443d06ebe0
 	github.com/sergi/go-diff v1.1.0
 	github.com/solo-io/go-list-licenses v0.1.4
-	github.com/solo-io/go-utils v0.24.8
+	github.com/solo-io/go-utils v0.25.2-0.20240617122603-62df1fedaca7
 	github.com/solo-io/k8s-utils v0.7.2
 	github.com/solo-io/protoc-gen-ext v0.0.18
 	github.com/solo-io/protoc-gen-openapi v0.2.2
diff --git a/go.sum b/go.sum
index b789d424ec6..b1b4fe2ed1f 100644
--- a/go.sum
+++ b/go.sum
@@ -2024,6 +2024,8 @@ github.com/solo-io/go-list-licenses v0.1.4/go.mod h1:x6LSp/NrYgVXwNum7ZOiaAYTpg6
 github.com/solo-io/go-utils v0.20.2/go.mod h1:6e8K1spnMWwlnJRSNp/J84GEyJbrcK4Gm7i+ehzCi8c=
 github.com/solo-io/go-utils v0.24.8 h1:gukFEvQ0SSRzIwysulI6w0c/dG08TCohO9QxwCqW6Lg=
 github.com/solo-io/go-utils v0.24.8/go.mod h1:bFFKO4Ih+sPViwNdVxv3z5dRrzMcJjNMHlx4zA8vxSg=
+github.com/solo-io/go-utils v0.25.2-0.20240617122603-62df1fedaca7 h1:g3lhpMSi/HxEagTP/Uy7Mc/4TxYtijkLaOa4HknerO0=
+github.com/solo-io/go-utils v0.25.2-0.20240617122603-62df1fedaca7/go.mod h1:bFFKO4Ih+sPViwNdVxv3z5dRrzMcJjNMHlx4zA8vxSg=
 github.com/solo-io/k8s-utils v0.7.2 h1:pIRiTOpwymdCHUOSjzKDi/Ay16FNtF7JV7NIRlC2ZNQ=
 github.com/solo-io/k8s-utils v0.7.2/go.mod h1:RrT6PVTSD1X0vteKCQmGzoAAfjI1U5oV/wA+T3T+NoM=
 github.com/solo-io/protoc-gen-ext v0.0.18 h1:zSAL8NzWpJUGYoA5IyjHiKASNyHjR0uxBQ7eQS94i3A=

From 5a496b91150563cf7f2c0049fc244ec5222ed6cc Mon Sep 17 00:00:00 2001
From: Jacob Bohanon <jacob.bohanon@solo.io>
Date: Mon, 17 Jun 2024 08:33:39 -0400
Subject: [PATCH 08/35] revert to cli portforwarder after getting stupid error
 again

---
 pkg/utils/kubeutils/portforward/portforwarder.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/utils/kubeutils/portforward/portforwarder.go b/pkg/utils/kubeutils/portforward/portforwarder.go
index 548eb0eee55..b96cd5b6ed2 100644
--- a/pkg/utils/kubeutils/portforward/portforwarder.go
+++ b/pkg/utils/kubeutils/portforward/portforwarder.go
@@ -33,5 +33,5 @@ type PortForwarder interface {
 
 // NewPortForwarder returns an implementation of a PortForwarder
 func NewPortForwarder(options ...Option) PortForwarder {
-	return NewApiPortForwarder(options...)
+	return NewCliPortForwarder(options...)
 }

From 205655bbe25224ae6dd40a378ad0fbeb4d253e62 Mon Sep 17 00:00:00 2001
From: Jacob Bohanon <jacob.bohanon@solo.io>
Date: Mon, 17 Jun 2024 08:42:40 -0400
Subject: [PATCH 09/35] mod tidy

---
 go.sum | 2 --
 1 file changed, 2 deletions(-)

diff --git a/go.sum b/go.sum
index b1b4fe2ed1f..3a3628f20b9 100644
--- a/go.sum
+++ b/go.sum
@@ -2022,8 +2022,6 @@ github.com/solo-io/go-control-plane-fork-v2 v1.29.0-patch1/go.mod h1:ZBTaoJ23lqI
 github.com/solo-io/go-list-licenses v0.1.4 h1:u4xh1OUORT4iSWuAp3Q4NsfHcDaeUV8QRDH8ACQqbxw=
 github.com/solo-io/go-list-licenses v0.1.4/go.mod h1:x6LSp/NrYgVXwNum7ZOiaAYTpg6B3F6TrWYfcdHVroA=
 github.com/solo-io/go-utils v0.20.2/go.mod h1:6e8K1spnMWwlnJRSNp/J84GEyJbrcK4Gm7i+ehzCi8c=
-github.com/solo-io/go-utils v0.24.8 h1:gukFEvQ0SSRzIwysulI6w0c/dG08TCohO9QxwCqW6Lg=
-github.com/solo-io/go-utils v0.24.8/go.mod h1:bFFKO4Ih+sPViwNdVxv3z5dRrzMcJjNMHlx4zA8vxSg=
 github.com/solo-io/go-utils v0.25.2-0.20240617122603-62df1fedaca7 h1:g3lhpMSi/HxEagTP/Uy7Mc/4TxYtijkLaOa4HknerO0=
 github.com/solo-io/go-utils v0.25.2-0.20240617122603-62df1fedaca7/go.mod h1:bFFKO4Ih+sPViwNdVxv3z5dRrzMcJjNMHlx4zA8vxSg=
 github.com/solo-io/k8s-utils v0.7.2 h1:pIRiTOpwymdCHUOSjzKDi/Ay16FNtF7JV7NIRlC2ZNQ=

From 44f2c491e2d26316c1d464faa1100d0f52789efb Mon Sep 17 00:00:00 2001
From: Jacob Bohanon <jacob.bohanon@solo.io>
Date: Mon, 17 Jun 2024 12:39:38 -0400
Subject: [PATCH 10/35] bump go-utils

---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 16f7188b3e2..115cee5c01f 100644
--- a/go.mod
+++ b/go.mod
@@ -48,7 +48,7 @@ require (
 	github.com/saiskee/gettercheck v0.0.0-20210820204958-38443d06ebe0
 	github.com/sergi/go-diff v1.1.0
 	github.com/solo-io/go-list-licenses v0.1.4
-	github.com/solo-io/go-utils v0.25.2-0.20240617122603-62df1fedaca7
+	github.com/solo-io/go-utils v0.25.2
 	github.com/solo-io/k8s-utils v0.7.2
 	github.com/solo-io/protoc-gen-ext v0.0.18
 	github.com/solo-io/protoc-gen-openapi v0.2.2
diff --git a/go.sum b/go.sum
index 3a3628f20b9..c01511ab7e8 100644
--- a/go.sum
+++ b/go.sum
@@ -2022,8 +2022,8 @@ github.com/solo-io/go-control-plane-fork-v2 v1.29.0-patch1/go.mod h1:ZBTaoJ23lqI
 github.com/solo-io/go-list-licenses v0.1.4 h1:u4xh1OUORT4iSWuAp3Q4NsfHcDaeUV8QRDH8ACQqbxw=
 github.com/solo-io/go-list-licenses v0.1.4/go.mod h1:x6LSp/NrYgVXwNum7ZOiaAYTpg6B3F6TrWYfcdHVroA=
 github.com/solo-io/go-utils v0.20.2/go.mod h1:6e8K1spnMWwlnJRSNp/J84GEyJbrcK4Gm7i+ehzCi8c=
-github.com/solo-io/go-utils v0.25.2-0.20240617122603-62df1fedaca7 h1:g3lhpMSi/HxEagTP/Uy7Mc/4TxYtijkLaOa4HknerO0=
-github.com/solo-io/go-utils v0.25.2-0.20240617122603-62df1fedaca7/go.mod h1:bFFKO4Ih+sPViwNdVxv3z5dRrzMcJjNMHlx4zA8vxSg=
+github.com/solo-io/go-utils v0.25.2 h1:FteDaEeDr67BcWtcY/yBm/2pcM7ZaMzek4CUJKEddG4=
+github.com/solo-io/go-utils v0.25.2/go.mod h1:bFFKO4Ih+sPViwNdVxv3z5dRrzMcJjNMHlx4zA8vxSg=
 github.com/solo-io/k8s-utils v0.7.2 h1:pIRiTOpwymdCHUOSjzKDi/Ay16FNtF7JV7NIRlC2ZNQ=
 github.com/solo-io/k8s-utils v0.7.2/go.mod h1:RrT6PVTSD1X0vteKCQmGzoAAfjI1U5oV/wA+T3T+NoM=
 github.com/solo-io/protoc-gen-ext v0.0.18 h1:zSAL8NzWpJUGYoA5IyjHiKASNyHjR0uxBQ7eQS94i3A=

From 9674f42ac002b1039229f47c7de80657d518ec42 Mon Sep 17 00:00:00 2001
From: Jacob Bohanon <jacob.bohanon@solo.io>
Date: Mon, 17 Jun 2024 14:27:12 -0400
Subject: [PATCH 11/35] add dep bump changelog

---
 changelog/v1.18.0-beta1/port-forward-safety.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/changelog/v1.18.0-beta1/port-forward-safety.yaml b/changelog/v1.18.0-beta1/port-forward-safety.yaml
index d02a0361ae0..c1bc12d4c3e 100644
--- a/changelog/v1.18.0-beta1/port-forward-safety.yaml
+++ b/changelog/v1.18.0-beta1/port-forward-safety.yaml
@@ -5,3 +5,7 @@ changelog:
     description: >-
       Add safety around port forward util to ensure the port forward can be dialed
       before returning nil.
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: solo-io
+    dependencyRepo: go-utils
+    dependencyTag: v0.25.2

From 1cf6ed4a8f188d42e1ca20c1fdcc58e71b9f1d90 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Thu, 20 Jun 2024 19:40:47 +0000
Subject: [PATCH 12/35] Adding changelog file to new location

---
 changelog/v1.18.0-beta2/port-forward-safety.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 changelog/v1.18.0-beta2/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta2/port-forward-safety.yaml b/changelog/v1.18.0-beta2/port-forward-safety.yaml
new file mode 100644
index 00000000000..c1bc12d4c3e
--- /dev/null
+++ b/changelog/v1.18.0-beta2/port-forward-safety.yaml
@@ -0,0 +1,11 @@
+changelog:
+  - type: NON_USER_FACING
+    issueLink: https://github.com/solo-io/gloo/issues/9353
+    resolvesIssue: false
+    description: >-
+      Add safety around port forward util to ensure the port forward can be dialed
+      before returning nil.
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: solo-io
+    dependencyRepo: go-utils
+    dependencyTag: v0.25.2

From beae1338c37a95f4e662bc81b16f4074282e22ff Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Thu, 20 Jun 2024 19:40:47 +0000
Subject: [PATCH 13/35] Deleting changelog file from old location

---
 changelog/v1.18.0-beta1/port-forward-safety.yaml | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 changelog/v1.18.0-beta1/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta1/port-forward-safety.yaml b/changelog/v1.18.0-beta1/port-forward-safety.yaml
deleted file mode 100644
index c1bc12d4c3e..00000000000
--- a/changelog/v1.18.0-beta1/port-forward-safety.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-changelog:
-  - type: NON_USER_FACING
-    issueLink: https://github.com/solo-io/gloo/issues/9353
-    resolvesIssue: false
-    description: >-
-      Add safety around port forward util to ensure the port forward can be dialed
-      before returning nil.
-  - type: DEPENDENCY_BUMP
-    dependencyOwner: solo-io
-    dependencyRepo: go-utils
-    dependencyTag: v0.25.2

From d8933205820434dbdb2d60f129a8933041c8a7d6 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Thu, 27 Jun 2024 17:49:42 +0000
Subject: [PATCH 14/35] Adding changelog file to new location

---
 changelog/v1.18.0-beta3/port-forward-safety.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 changelog/v1.18.0-beta3/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta3/port-forward-safety.yaml b/changelog/v1.18.0-beta3/port-forward-safety.yaml
new file mode 100644
index 00000000000..c1bc12d4c3e
--- /dev/null
+++ b/changelog/v1.18.0-beta3/port-forward-safety.yaml
@@ -0,0 +1,11 @@
+changelog:
+  - type: NON_USER_FACING
+    issueLink: https://github.com/solo-io/gloo/issues/9353
+    resolvesIssue: false
+    description: >-
+      Add safety around port forward util to ensure the port forward can be dialed
+      before returning nil.
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: solo-io
+    dependencyRepo: go-utils
+    dependencyTag: v0.25.2

From f3d953a85acea93e9877932a4617a9b0edabb2b0 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Thu, 27 Jun 2024 17:49:43 +0000
Subject: [PATCH 15/35] Deleting changelog file from old location

---
 changelog/v1.18.0-beta2/port-forward-safety.yaml | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 changelog/v1.18.0-beta2/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta2/port-forward-safety.yaml b/changelog/v1.18.0-beta2/port-forward-safety.yaml
deleted file mode 100644
index c1bc12d4c3e..00000000000
--- a/changelog/v1.18.0-beta2/port-forward-safety.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-changelog:
-  - type: NON_USER_FACING
-    issueLink: https://github.com/solo-io/gloo/issues/9353
-    resolvesIssue: false
-    description: >-
-      Add safety around port forward util to ensure the port forward can be dialed
-      before returning nil.
-  - type: DEPENDENCY_BUMP
-    dependencyOwner: solo-io
-    dependencyRepo: go-utils
-    dependencyTag: v0.25.2

From 530da2df7674831085a408b44570498e189ca9fe Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Fri, 28 Jun 2024 17:06:13 +0000
Subject: [PATCH 16/35] Adding changelog file to new location

---
 changelog/v1.18.0-beta4/port-forward-safety.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 changelog/v1.18.0-beta4/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta4/port-forward-safety.yaml b/changelog/v1.18.0-beta4/port-forward-safety.yaml
new file mode 100644
index 00000000000..c1bc12d4c3e
--- /dev/null
+++ b/changelog/v1.18.0-beta4/port-forward-safety.yaml
@@ -0,0 +1,11 @@
+changelog:
+  - type: NON_USER_FACING
+    issueLink: https://github.com/solo-io/gloo/issues/9353
+    resolvesIssue: false
+    description: >-
+      Add safety around port forward util to ensure the port forward can be dialed
+      before returning nil.
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: solo-io
+    dependencyRepo: go-utils
+    dependencyTag: v0.25.2

From ffef61f7e64653c8d51a0e9f83e3f3dfd4f0faea Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Fri, 28 Jun 2024 17:06:13 +0000
Subject: [PATCH 17/35] Deleting changelog file from old location

---
 changelog/v1.18.0-beta3/port-forward-safety.yaml | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 changelog/v1.18.0-beta3/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta3/port-forward-safety.yaml b/changelog/v1.18.0-beta3/port-forward-safety.yaml
deleted file mode 100644
index c1bc12d4c3e..00000000000
--- a/changelog/v1.18.0-beta3/port-forward-safety.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-changelog:
-  - type: NON_USER_FACING
-    issueLink: https://github.com/solo-io/gloo/issues/9353
-    resolvesIssue: false
-    description: >-
-      Add safety around port forward util to ensure the port forward can be dialed
-      before returning nil.
-  - type: DEPENDENCY_BUMP
-    dependencyOwner: solo-io
-    dependencyRepo: go-utils
-    dependencyTag: v0.25.2

From 913979bb6e7eca5009b016f3c66d6a02467492ee Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Mon, 1 Jul 2024 15:54:38 +0000
Subject: [PATCH 18/35] Adding changelog file to new location

---
 changelog/v1.18.0-beta5/port-forward-safety.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 changelog/v1.18.0-beta5/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta5/port-forward-safety.yaml b/changelog/v1.18.0-beta5/port-forward-safety.yaml
new file mode 100644
index 00000000000..c1bc12d4c3e
--- /dev/null
+++ b/changelog/v1.18.0-beta5/port-forward-safety.yaml
@@ -0,0 +1,11 @@
+changelog:
+  - type: NON_USER_FACING
+    issueLink: https://github.com/solo-io/gloo/issues/9353
+    resolvesIssue: false
+    description: >-
+      Add safety around port forward util to ensure the port forward can be dialed
+      before returning nil.
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: solo-io
+    dependencyRepo: go-utils
+    dependencyTag: v0.25.2

From a6d0aec14d139f8abd62c78471f79678fb65cadd Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Mon, 1 Jul 2024 15:54:38 +0000
Subject: [PATCH 19/35] Deleting changelog file from old location

---
 changelog/v1.18.0-beta4/port-forward-safety.yaml | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 changelog/v1.18.0-beta4/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta4/port-forward-safety.yaml b/changelog/v1.18.0-beta4/port-forward-safety.yaml
deleted file mode 100644
index c1bc12d4c3e..00000000000
--- a/changelog/v1.18.0-beta4/port-forward-safety.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-changelog:
-  - type: NON_USER_FACING
-    issueLink: https://github.com/solo-io/gloo/issues/9353
-    resolvesIssue: false
-    description: >-
-      Add safety around port forward util to ensure the port forward can be dialed
-      before returning nil.
-  - type: DEPENDENCY_BUMP
-    dependencyOwner: solo-io
-    dependencyRepo: go-utils
-    dependencyTag: v0.25.2

From 4da7c43e0e8665481eee372510956eaf44cb04a8 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Mon, 8 Jul 2024 16:27:41 +0000
Subject: [PATCH 20/35] Adding changelog file to new location

---
 changelog/v1.18.0-beta6/port-forward-safety.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 changelog/v1.18.0-beta6/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta6/port-forward-safety.yaml b/changelog/v1.18.0-beta6/port-forward-safety.yaml
new file mode 100644
index 00000000000..c1bc12d4c3e
--- /dev/null
+++ b/changelog/v1.18.0-beta6/port-forward-safety.yaml
@@ -0,0 +1,11 @@
+changelog:
+  - type: NON_USER_FACING
+    issueLink: https://github.com/solo-io/gloo/issues/9353
+    resolvesIssue: false
+    description: >-
+      Add safety around port forward util to ensure the port forward can be dialed
+      before returning nil.
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: solo-io
+    dependencyRepo: go-utils
+    dependencyTag: v0.25.2

From 918c78bc650dc6b37a85178943bf4ffbc6a1f308 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Mon, 8 Jul 2024 16:27:42 +0000
Subject: [PATCH 21/35] Deleting changelog file from old location

---
 changelog/v1.18.0-beta5/port-forward-safety.yaml | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 changelog/v1.18.0-beta5/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta5/port-forward-safety.yaml b/changelog/v1.18.0-beta5/port-forward-safety.yaml
deleted file mode 100644
index c1bc12d4c3e..00000000000
--- a/changelog/v1.18.0-beta5/port-forward-safety.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-changelog:
-  - type: NON_USER_FACING
-    issueLink: https://github.com/solo-io/gloo/issues/9353
-    resolvesIssue: false
-    description: >-
-      Add safety around port forward util to ensure the port forward can be dialed
-      before returning nil.
-  - type: DEPENDENCY_BUMP
-    dependencyOwner: solo-io
-    dependencyRepo: go-utils
-    dependencyTag: v0.25.2

From 6beb071ee09c85d3f361f916b7f9f9a4181e3545 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Tue, 9 Jul 2024 17:49:05 +0000
Subject: [PATCH 22/35] Adding changelog file to new location

---
 changelog/v1.18.0-beta7/port-forward-safety.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 changelog/v1.18.0-beta7/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta7/port-forward-safety.yaml b/changelog/v1.18.0-beta7/port-forward-safety.yaml
new file mode 100644
index 00000000000..c1bc12d4c3e
--- /dev/null
+++ b/changelog/v1.18.0-beta7/port-forward-safety.yaml
@@ -0,0 +1,11 @@
+changelog:
+  - type: NON_USER_FACING
+    issueLink: https://github.com/solo-io/gloo/issues/9353
+    resolvesIssue: false
+    description: >-
+      Add safety around port forward util to ensure the port forward can be dialed
+      before returning nil.
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: solo-io
+    dependencyRepo: go-utils
+    dependencyTag: v0.25.2

From 19592ac6db9066c2082271840223048cb1be5800 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Tue, 9 Jul 2024 17:49:06 +0000
Subject: [PATCH 23/35] Deleting changelog file from old location

---
 changelog/v1.18.0-beta6/port-forward-safety.yaml | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 changelog/v1.18.0-beta6/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta6/port-forward-safety.yaml b/changelog/v1.18.0-beta6/port-forward-safety.yaml
deleted file mode 100644
index c1bc12d4c3e..00000000000
--- a/changelog/v1.18.0-beta6/port-forward-safety.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-changelog:
-  - type: NON_USER_FACING
-    issueLink: https://github.com/solo-io/gloo/issues/9353
-    resolvesIssue: false
-    description: >-
-      Add safety around port forward util to ensure the port forward can be dialed
-      before returning nil.
-  - type: DEPENDENCY_BUMP
-    dependencyOwner: solo-io
-    dependencyRepo: go-utils
-    dependencyTag: v0.25.2

From 937121b45c90a29d173d1d3731f962d62a8cee2b Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Thu, 11 Jul 2024 18:07:27 +0000
Subject: [PATCH 24/35] Adding changelog file to new location

---
 changelog/v1.18.0-beta8/port-forward-safety.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 changelog/v1.18.0-beta8/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta8/port-forward-safety.yaml b/changelog/v1.18.0-beta8/port-forward-safety.yaml
new file mode 100644
index 00000000000..c1bc12d4c3e
--- /dev/null
+++ b/changelog/v1.18.0-beta8/port-forward-safety.yaml
@@ -0,0 +1,11 @@
+changelog:
+  - type: NON_USER_FACING
+    issueLink: https://github.com/solo-io/gloo/issues/9353
+    resolvesIssue: false
+    description: >-
+      Add safety around port forward util to ensure the port forward can be dialed
+      before returning nil.
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: solo-io
+    dependencyRepo: go-utils
+    dependencyTag: v0.25.2

From 32af0ce9c1418ccc28b3d5ccf4de8ff522f81be9 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Thu, 11 Jul 2024 18:07:27 +0000
Subject: [PATCH 25/35] Deleting changelog file from old location

---
 changelog/v1.18.0-beta7/port-forward-safety.yaml | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 changelog/v1.18.0-beta7/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta7/port-forward-safety.yaml b/changelog/v1.18.0-beta7/port-forward-safety.yaml
deleted file mode 100644
index c1bc12d4c3e..00000000000
--- a/changelog/v1.18.0-beta7/port-forward-safety.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-changelog:
-  - type: NON_USER_FACING
-    issueLink: https://github.com/solo-io/gloo/issues/9353
-    resolvesIssue: false
-    description: >-
-      Add safety around port forward util to ensure the port forward can be dialed
-      before returning nil.
-  - type: DEPENDENCY_BUMP
-    dependencyOwner: solo-io
-    dependencyRepo: go-utils
-    dependencyTag: v0.25.2

From df1806767d86dbc6f32bd10302f23118edd11b72 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Wed, 17 Jul 2024 20:58:02 +0000
Subject: [PATCH 26/35] Adding changelog file to new location

---
 changelog/v1.18.0-beta9/port-forward-safety.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 changelog/v1.18.0-beta9/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta9/port-forward-safety.yaml b/changelog/v1.18.0-beta9/port-forward-safety.yaml
new file mode 100644
index 00000000000..c1bc12d4c3e
--- /dev/null
+++ b/changelog/v1.18.0-beta9/port-forward-safety.yaml
@@ -0,0 +1,11 @@
+changelog:
+  - type: NON_USER_FACING
+    issueLink: https://github.com/solo-io/gloo/issues/9353
+    resolvesIssue: false
+    description: >-
+      Add safety around port forward util to ensure the port forward can be dialed
+      before returning nil.
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: solo-io
+    dependencyRepo: go-utils
+    dependencyTag: v0.25.2

From aaf94f85b358b9f4ba670a4a16c787e6470e1ec8 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Wed, 17 Jul 2024 20:58:03 +0000
Subject: [PATCH 27/35] Deleting changelog file from old location

---
 changelog/v1.18.0-beta8/port-forward-safety.yaml | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 changelog/v1.18.0-beta8/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta8/port-forward-safety.yaml b/changelog/v1.18.0-beta8/port-forward-safety.yaml
deleted file mode 100644
index c1bc12d4c3e..00000000000
--- a/changelog/v1.18.0-beta8/port-forward-safety.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-changelog:
-  - type: NON_USER_FACING
-    issueLink: https://github.com/solo-io/gloo/issues/9353
-    resolvesIssue: false
-    description: >-
-      Add safety around port forward util to ensure the port forward can be dialed
-      before returning nil.
-  - type: DEPENDENCY_BUMP
-    dependencyOwner: solo-io
-    dependencyRepo: go-utils
-    dependencyTag: v0.25.2

From 900faad1bbd1ff229c956ffa219d0ec092ba16c8 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Fri, 19 Jul 2024 15:06:55 +0000
Subject: [PATCH 28/35] Adding changelog file to new location

---
 changelog/v1.18.0-beta10/port-forward-safety.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 changelog/v1.18.0-beta10/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta10/port-forward-safety.yaml b/changelog/v1.18.0-beta10/port-forward-safety.yaml
new file mode 100644
index 00000000000..c1bc12d4c3e
--- /dev/null
+++ b/changelog/v1.18.0-beta10/port-forward-safety.yaml
@@ -0,0 +1,11 @@
+changelog:
+  - type: NON_USER_FACING
+    issueLink: https://github.com/solo-io/gloo/issues/9353
+    resolvesIssue: false
+    description: >-
+      Add safety around port forward util to ensure the port forward can be dialed
+      before returning nil.
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: solo-io
+    dependencyRepo: go-utils
+    dependencyTag: v0.25.2

From b6d4829be97c510aebdf280ddb804990a5d36ff4 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Fri, 19 Jul 2024 15:06:55 +0000
Subject: [PATCH 29/35] Deleting changelog file from old location

---
 changelog/v1.18.0-beta9/port-forward-safety.yaml | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 changelog/v1.18.0-beta9/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta9/port-forward-safety.yaml b/changelog/v1.18.0-beta9/port-forward-safety.yaml
deleted file mode 100644
index c1bc12d4c3e..00000000000
--- a/changelog/v1.18.0-beta9/port-forward-safety.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-changelog:
-  - type: NON_USER_FACING
-    issueLink: https://github.com/solo-io/gloo/issues/9353
-    resolvesIssue: false
-    description: >-
-      Add safety around port forward util to ensure the port forward can be dialed
-      before returning nil.
-  - type: DEPENDENCY_BUMP
-    dependencyOwner: solo-io
-    dependencyRepo: go-utils
-    dependencyTag: v0.25.2

From 35e7f757570422e5e56bc77ed6f4e7017a56d172 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Tue, 23 Jul 2024 13:14:16 +0000
Subject: [PATCH 30/35] Adding changelog file to new location

---
 changelog/v1.18.0-beta11/port-forward-safety.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 changelog/v1.18.0-beta11/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta11/port-forward-safety.yaml b/changelog/v1.18.0-beta11/port-forward-safety.yaml
new file mode 100644
index 00000000000..c1bc12d4c3e
--- /dev/null
+++ b/changelog/v1.18.0-beta11/port-forward-safety.yaml
@@ -0,0 +1,11 @@
+changelog:
+  - type: NON_USER_FACING
+    issueLink: https://github.com/solo-io/gloo/issues/9353
+    resolvesIssue: false
+    description: >-
+      Add safety around port forward util to ensure the port forward can be dialed
+      before returning nil.
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: solo-io
+    dependencyRepo: go-utils
+    dependencyTag: v0.25.2

From a496bd451e988dac0ad97482fc9bb9e8ef62a859 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Tue, 23 Jul 2024 13:14:16 +0000
Subject: [PATCH 31/35] Deleting changelog file from old location

---
 changelog/v1.18.0-beta10/port-forward-safety.yaml | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 changelog/v1.18.0-beta10/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta10/port-forward-safety.yaml b/changelog/v1.18.0-beta10/port-forward-safety.yaml
deleted file mode 100644
index c1bc12d4c3e..00000000000
--- a/changelog/v1.18.0-beta10/port-forward-safety.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-changelog:
-  - type: NON_USER_FACING
-    issueLink: https://github.com/solo-io/gloo/issues/9353
-    resolvesIssue: false
-    description: >-
-      Add safety around port forward util to ensure the port forward can be dialed
-      before returning nil.
-  - type: DEPENDENCY_BUMP
-    dependencyOwner: solo-io
-    dependencyRepo: go-utils
-    dependencyTag: v0.25.2

From 6432aa3d1694b922d2443b6f23d3a6fb89e864da Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Fri, 26 Jul 2024 18:11:25 +0000
Subject: [PATCH 32/35] Adding changelog file to new location

---
 changelog/v1.18.0-beta12/port-forward-safety.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 changelog/v1.18.0-beta12/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta12/port-forward-safety.yaml b/changelog/v1.18.0-beta12/port-forward-safety.yaml
new file mode 100644
index 00000000000..c1bc12d4c3e
--- /dev/null
+++ b/changelog/v1.18.0-beta12/port-forward-safety.yaml
@@ -0,0 +1,11 @@
+changelog:
+  - type: NON_USER_FACING
+    issueLink: https://github.com/solo-io/gloo/issues/9353
+    resolvesIssue: false
+    description: >-
+      Add safety around port forward util to ensure the port forward can be dialed
+      before returning nil.
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: solo-io
+    dependencyRepo: go-utils
+    dependencyTag: v0.25.2

From 8de24ef6dc7d73eaae5d0f8e7567eaa3acd15fab Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Fri, 26 Jul 2024 18:11:25 +0000
Subject: [PATCH 33/35] Deleting changelog file from old location

---
 changelog/v1.18.0-beta11/port-forward-safety.yaml | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 changelog/v1.18.0-beta11/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta11/port-forward-safety.yaml b/changelog/v1.18.0-beta11/port-forward-safety.yaml
deleted file mode 100644
index c1bc12d4c3e..00000000000
--- a/changelog/v1.18.0-beta11/port-forward-safety.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-changelog:
-  - type: NON_USER_FACING
-    issueLink: https://github.com/solo-io/gloo/issues/9353
-    resolvesIssue: false
-    description: >-
-      Add safety around port forward util to ensure the port forward can be dialed
-      before returning nil.
-  - type: DEPENDENCY_BUMP
-    dependencyOwner: solo-io
-    dependencyRepo: go-utils
-    dependencyTag: v0.25.2

From 4783df1f09abbb454607946d3f51830be59d21ff Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Wed, 31 Jul 2024 14:57:55 +0000
Subject: [PATCH 34/35] Adding changelog file to new location

---
 changelog/v1.18.0-beta13/port-forward-safety.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 changelog/v1.18.0-beta13/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta13/port-forward-safety.yaml b/changelog/v1.18.0-beta13/port-forward-safety.yaml
new file mode 100644
index 00000000000..c1bc12d4c3e
--- /dev/null
+++ b/changelog/v1.18.0-beta13/port-forward-safety.yaml
@@ -0,0 +1,11 @@
+changelog:
+  - type: NON_USER_FACING
+    issueLink: https://github.com/solo-io/gloo/issues/9353
+    resolvesIssue: false
+    description: >-
+      Add safety around port forward util to ensure the port forward can be dialed
+      before returning nil.
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: solo-io
+    dependencyRepo: go-utils
+    dependencyTag: v0.25.2

From 86c477b1a47ba4ddf40bdee118c3513d202d5794 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Wed, 31 Jul 2024 14:57:56 +0000
Subject: [PATCH 35/35] Deleting changelog file from old location

---
 changelog/v1.18.0-beta12/port-forward-safety.yaml | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 changelog/v1.18.0-beta12/port-forward-safety.yaml

diff --git a/changelog/v1.18.0-beta12/port-forward-safety.yaml b/changelog/v1.18.0-beta12/port-forward-safety.yaml
deleted file mode 100644
index c1bc12d4c3e..00000000000
--- a/changelog/v1.18.0-beta12/port-forward-safety.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-changelog:
-  - type: NON_USER_FACING
-    issueLink: https://github.com/solo-io/gloo/issues/9353
-    resolvesIssue: false
-    description: >-
-      Add safety around port forward util to ensure the port forward can be dialed
-      before returning nil.
-  - type: DEPENDENCY_BUMP
-    dependencyOwner: solo-io
-    dependencyRepo: go-utils
-    dependencyTag: v0.25.2