NETOBSERV-1678: allow agent image configuration

Makefile

@@ -43,6 +43,8 @@ IMAGE_TAG_BASE ?= quay.io/$(IMAGE_ORG)/$(NAME)
 # Image URL to use all building/pushing image targets
 IMAGE ?= $(IMAGE_TAG_BASE):$(VERSION)
 PULL_POLICY ?=Always
+# Agent image URL to deploy
+AGENT_IMAGE ?= quay.io/netobserv/netobserv-ebpf-agent:main
 OCI_BUILD_OPTS ?=
 
 # Image building tool (docker / podman) - docker is preferred in CI
@@ -159,6 +161,7 @@ commands: ## Generate either oc or kubectl plugins and add them to build folder
 	K8S_CLI_BIN=$(K8S_CLI_BIN) \
 	IMAGE=$(IMAGE) \
 	PULL_POLICY=$(PULL_POLICY) \
+	AGENT_IMAGE=$(AGENT_IMAGE) \
 	VERSION=$(VERSION) \
 	./scripts/inject.sh
 

commands/netobserv

@@ -9,7 +9,7 @@ filter=""
 # CLI image to use
 img="quay.io/netobserv/network-observability-cli:main"
 
-if [ ! -z "$NETOBSERV_COLLECTOR_IMAGE" ]; then
+if [ -n "$NETOBSERV_COLLECTOR_IMAGE" ]; then
   echo "using custom collector image $NETOBSERV_COLLECTOR_IMAGE"
   img="$NETOBSERV_COLLECTOR_IMAGE"
 fi

res/flow-capture.yml

@@ -19,7 +19,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
       - name: netobserv-cli
-        image: quay.io/netobserv/netobserv-ebpf-agent:main
+        image: "{{AGENT_IMAGE_URL}}"
         imagePullPolicy: Always
         securityContext:
           privileged: true

res/packet-capture.yml

@@ -19,7 +19,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
       - name: netobserv-cli
-        image: quay.io/netobserv/netobserv-ebpf-agent:main
+        image: "{{AGENT_IMAGE_URL}}"
         imagePullPolicy: Always
         securityContext:
           privileged: true

scripts/functions.sh

@@ -8,6 +8,14 @@ set -eu
 K8S_CLI_BIN_PATH=$( which oc 2>/dev/null || which kubectl 2>/dev/null )
 K8S_CLI_BIN=$( basename "${K8S_CLI_BIN_PATH}" )
 
+# eBPF agent image to use
+agentImg="quay.io/netobserv/netobserv-ebpf-agent:main"
+
+if [ -n "$NETOBSERV_AGENT_IMAGE" ]; then
+  echo "using custom agent image $NETOBSERV_AGENT_IMAGE"
+  agentImg="$NETOBSERV_AGENT_IMAGE"
+fi
+
 function loadYAMLs() {
   namespaceYAML='
     namespaceYAMLContent
@@ -29,13 +37,15 @@ function loadYAMLs() {
   if [ -f ./res/flow-capture.yml ]; then
     flowAgentYAML="$(cat ./res/flow-capture.yml)"
   fi
+  flowAgentYAML="${flowAgentYAML/"{{AGENT_IMAGE_URL}}"/${agentImg}}"
 
   packetAgentYAML='
     packetAgentYAMLContent
   '
   if [ -f ./res/packet-capture.yml ]; then
     packetAgentYAML="$(cat ./res/packet-capture.yml)"
   fi
+  packetAgentYAML="${packetAgentYAML/"{{AGENT_IMAGE_URL}}"/${agentImg}}"
 
   collectorServiceYAML='
     collectorServiceYAMLContent

scripts/inject.sh

@@ -16,6 +16,13 @@ else
   sed -i.bak "s/--image-pull-policy=.*/--image-pull-policy='$PULL_POLICY' \\\\/" ./tmp/netobserv
 fi
 
+if [ -z "$AGENT_IMAGE" ]; then
+  echo "eBPF agent image not provided, keeping current one"
+else
+  echo "updating eBPF agent images to $AGENT_IMAGE"
+  sed -i.bak "s|^agentImg=.*|agentImg=\"$AGENT_IMAGE\"|" ./tmp/functions.sh
+fi
+
 if [ -z "$VERSION" ]; then
   echo "version not provided, keeping current one"
 else