From c08b28b841b2fcfbabc14d0911e50d7c9491c2be Mon Sep 17 00:00:00 2001
From: Julien Pinsonneau <91894519+jpinsonneau@users.noreply.github.com>
Date: Mon, 25 Mar 2024 12:02:05 +0100
Subject: [PATCH] eBPF env renaming (#600)

---
 controllers/ebpf/agent_controller.go              | 4 ++--
 controllers/flowcollector_controller_ebpf_test.go | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/controllers/ebpf/agent_controller.go b/controllers/ebpf/agent_controller.go
index 1d2c310b3..ebf433550 100644
--- a/controllers/ebpf/agent_controller.go
+++ b/controllers/ebpf/agent_controller.go
@@ -31,8 +31,8 @@ const (
 	envExcludeInterfaces          = "EXCLUDE_INTERFACES"
 	envInterfaces                 = "INTERFACES"
 	envAgentIP                    = "AGENT_IP"
-	envFlowsTargetHost            = "FLOWS_TARGET_HOST"
-	envFlowsTargetPort            = "FLOWS_TARGET_PORT"
+	envFlowsTargetHost            = "HOST"
+	envFlowsTargetPort            = "PORT"
 	envSampling                   = "SAMPLING"
 	envExport                     = "EXPORT"
 	envKafkaBrokers               = "KAFKA_BROKERS"
diff --git a/controllers/flowcollector_controller_ebpf_test.go b/controllers/flowcollector_controller_ebpf_test.go
index 3aaaf5ec3..668c2242d 100644
--- a/controllers/flowcollector_controller_ebpf_test.go
+++ b/controllers/flowcollector_controller_ebpf_test.go
@@ -117,15 +117,15 @@ func flowCollectorEBPFSpecs() {
 				v1.EnvVar{Name: "BUFFERS_LENGTH", Value: "100"},
 				v1.EnvVar{Name: "GOGC", Value: "400"},
 				v1.EnvVar{Name: "SAMPLING", Value: "123"},
-				v1.EnvVar{Name: "FLOWS_TARGET_PORT", Value: "9999"},
+				v1.EnvVar{Name: "PORT", Value: "9999"},
 			))
 			hostFound := false
 			for _, env := range spec.Containers[0].Env {
-				if env.Name == "FLOWS_TARGET_HOST" {
+				if env.Name == "HOST" {
 					if env.ValueFrom == nil ||
 						env.ValueFrom.FieldRef == nil ||
 						env.ValueFrom.FieldRef.FieldPath != "status.hostIP" {
-						Fail(fmt.Sprintf("FLOWS_TARGET_HOST expected to refer to \"status.hostIP\"."+
+						Fail(fmt.Sprintf("HOST expected to refer to \"status.hostIP\"."+
 							" Got: %+v", env.ValueFrom))
 					} else {
 						hostFound = true
@@ -134,7 +134,7 @@ func flowCollectorEBPFSpecs() {
 				}
 			}
 			Expect(hostFound).To(BeTrue(),
-				fmt.Sprintf("expected FLOWS_TARGET_HOST env var in %+v", spec.Containers[0].Env))
+				fmt.Sprintf("expected HOST env var in %+v", spec.Containers[0].Env))
 
 			ns := v1.Namespace{}
 			By("expecting to create the netobserv-privileged namespace")