Address PR Comments

Author: sheylatrudo

.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e.stages.yaml

@@ -49,9 +49,9 @@ stages:
       CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
       CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
       IPAM_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/azure-ipam
-      IPV6_HP_BPF_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/ipv6-hp-bpf
       CNS_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/cns
       CNI_IMAGE_NAME_OVERRIDE: $(IMAGE_REPO_PATH)/cni
+      IPV6_HP_BPF_REPO_PATH: $(IMAGE_REPO_PATH)/
     jobs:
       - job: ${{ parameters.name }}
         displayName: Cilium Dualstack Overlay Test Suite - (${{ parameters.name }})

.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e.steps.yaml

@@ -46,12 +46,10 @@ steps:
         echo "$CILIUM_VERSION_TAG"
         [[ -z $IPV6_HP_BPF_VERSION ]] && IPV6_HP_BPF_VERSION=$(make ipv6-hp-bpf-version)
         echo "$IPV6_HP_BPF_VERSION"
-        [[ -z $IPV6_HP_BPF_IMAGE_NAME_OVERRIDE ]] && IPV6_HP_BPF_IMAGE_NAME_OVERRIDE=ipv6-hp-bpf
-        echo "$IPV6_HP_BPF_IMAGE_NAME_OVERRIDE"
         [[ -z $IPV6_IMAGE_REGISTRY ]] && IPV6_IMAGE_REGISTRY=acnpublic.azurecr.io
         echo "$IPV6_HP_BPF_IMAGE_REGISTRY"
         echo "install Cilium ${CILIUM_DUALSTACK_VERSION} onto Overlay Cluster"
-        envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY},${IPV6_IMAGE_REGISTRY},${IPV6_HP_BPF_IMAGE_NAME_OVERRIDE},${IPV6_HP_BPF_VERSION}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset-dualstack.yaml | kubectl apply -f -
+        envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY},${IPV6_IMAGE_REGISTRY},${IPV6_HP_BPF_IMAGE_REPO_PATH},${IPV6_HP_BPF_VERSION}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset-dualstack.yaml | kubectl apply -f -
         envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
         kubectl get po -owide -A
     name: "installCilium"

test/integration/manifests/cilium/v1.14/cilium-agent/templates/daemonset-dualstack.yaml

@@ -302,8 +302,8 @@ spec:
           name: cilium-cgroup
         - mountPath: /var/run/cilium
           name: cilium-run
-      - name: start-ipv6-hp-bpf ## TODO make this change across all dualstack cil agents
-        image: $IPV6_IMAGE_REGISTRY/$IPV6_HP_BPF_IMAGE_NAME_OVERRIDE:$IPV6_HP_BPF_VERSION
+      - name: start-ipv6-hp-bpf
+        image: $IPV6_IMAGE_REGISTRY/$IPV6_HP_BPF_IMAGE_REPO_PATHipv6-hp-bpf:$IPV6_HP_BPF_VERSION
         imagePullPolicy: IfNotPresent
         command: [/ipv6-hp-bpf]
         securityContext:

test/integration/manifests/cilium/v1.16/cilium-agent/templates/daemonset-dualstack.yaml

@@ -320,7 +320,7 @@ spec:
           name: host-usr-lib
           readOnly: true
       - name: start-ipv6-hp-bpf
-        image: $IPV6_IMAGE_REGISTRY/$IPV6_HP_BPF_IMAGE_NAME_OVERRIDE:$IPV6_HP_BPF_VERSION
+        image: $IPV6_IMAGE_REGISTRY/$IPV6_HP_BPF_IMAGE_REPO_PATHipv6-hp-bpf:$IPV6_HP_BPF_VERSION
         imagePullPolicy: IfNotPresent
         command: [/ipv6-hp-bpf]
         securityContext:

test/integration/manifests/cilium/v1.17/cilium-agent/templates/daemonset-dualstack.yaml

@@ -320,7 +320,7 @@ spec:
           name: host-usr-lib
           readOnly: true
       - name: start-ipv6-hp-bpf
-        image: $IPV6_IMAGE_REGISTRY/$IPV6_HP_BPF_IMAGE_NAME_OVERRIDE:$IPV6_HP_BPF_VERSION
+        image: $IPV6_IMAGE_REGISTRY/$IPV6_HP_BPF_IMAGE_REPO_PATHipv6-hp-bpf:$IPV6_HP_BPF_VERSION
         imagePullPolicy: IfNotPresent
         command: [/ipv6-hp-bpf]
         securityContext: