From 36a951f9a6c8bc0f5dc6f6122d622e974f5db9f2 Mon Sep 17 00:00:00 2001
From: Elliott Baron <ebaron@redhat.com>
Date: Thu, 9 Nov 2023 16:47:23 -0500
Subject: [PATCH] fix(insights): add port to INSIGHTS_PROXY (#674)

(cherry picked from commit 2fc1e3e1aaf9c3e74a908ef892a7792efc9f1899)
---
 internal/controllers/insights/insights.go            | 4 ++--
 internal/controllers/insights/insights_controller.go | 1 +
 internal/controllers/insights/setup.go               | 3 ++-
 internal/controllers/insights/setup_test.go          | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/internal/controllers/insights/insights.go b/internal/controllers/insights/insights.go
index 0018ec45e..e7dbfa2d8 100644
--- a/internal/controllers/insights/insights.go
+++ b/internal/controllers/insights/insights.go
@@ -221,7 +221,7 @@ func (r *InsightsReconciler) createOrUpdateProxyService(ctx context.Context, svc
 		svc.Spec.Ports = []corev1.ServicePort{
 			{
 				Name:       "proxy",
-				Port:       8080,
+				Port:       ProxyServicePort,
 				TargetPort: intstr.FromString("proxy"),
 			},
 			{
@@ -278,7 +278,7 @@ func (r *InsightsReconciler) createOrUpdateProxyPodSpec(deploy *appsv1.Deploymen
 	container.Ports = []corev1.ContainerPort{
 		{
 			Name:          "proxy",
-			ContainerPort: 8080,
+			ContainerPort: ProxyServicePort,
 		},
 		{
 			Name:          "management",
diff --git a/internal/controllers/insights/insights_controller.go b/internal/controllers/insights/insights_controller.go
index 94950a8e8..769932e05 100644
--- a/internal/controllers/insights/insights_controller.go
+++ b/internal/controllers/insights/insights_controller.go
@@ -54,6 +54,7 @@ const (
 	InsightsConfigMapName    = "insights-proxy"
 	ProxyDeploymentName      = InsightsConfigMapName
 	ProxyServiceName         = ProxyDeploymentName
+	ProxyServicePort         = 8080
 	ProxySecretName          = "apicastconf"
 	EnvInsightsBackendDomain = "INSIGHTS_BACKEND_DOMAIN"
 	EnvInsightsProxyDomain   = "INSIGHTS_PROXY_DOMAIN"
diff --git a/internal/controllers/insights/setup.go b/internal/controllers/insights/setup.go
index b5eca7cce..2146ff08e 100644
--- a/internal/controllers/insights/setup.go
+++ b/internal/controllers/insights/setup.go
@@ -156,6 +156,7 @@ func (i *InsightsIntegration) deleteConfigMap(ctx context.Context, namespace str
 func (i *InsightsIntegration) getProxyURL(namespace string) *url.URL {
 	return &url.URL{
 		Scheme: "http", // TODO add https support (r.IsCertManagerInstalled)
-		Host:   fmt.Sprintf("%s.%s.svc.cluster.local", ProxyServiceName, namespace),
+		Host: fmt.Sprintf("%s.%s.svc.cluster.local:%d", ProxyServiceName, namespace,
+			ProxyServicePort),
 	}
 }
diff --git a/internal/controllers/insights/setup_test.go b/internal/controllers/insights/setup_test.go
index 216a326d7..22eb436a3 100644
--- a/internal/controllers/insights/setup_test.go
+++ b/internal/controllers/insights/setup_test.go
@@ -82,7 +82,7 @@ var _ = Describe("InsightsIntegration", func() {
 				result, err := integration.Setup()
 				Expect(err).ToNot(HaveOccurred())
 				Expect(result).ToNot(BeNil())
-				Expect(result.String()).To(Equal("http://insights-proxy.test.svc.cluster.local"))
+				Expect(result.String()).To(Equal("http://insights-proxy.test.svc.cluster.local:8080"))
 			})
 
 			It("should create config map", func() {