Override IMAGE_TAG correctly

Signed-off-by: Fiachra Corcoran <fiachra.corcoran@est.tech>

Author: efiacor

.github/workflows/porch-e2e-ci-jobs.yaml

@@ -154,10 +154,7 @@ jobs:
           kind load docker-image ${IMAGE_REPO}/${PORCH_WRAPPER_SERVER_IMAGE}:${{ needs.build.outputs.image-tag }} -n ${KIND_CONTEXT_NAME}
           kind load docker-image ${IMAGE_REPO}/${TEST_GIT_SERVER_IMAGE}:${{ needs.build.outputs.image-tag }} -n ${KIND_CONTEXT_NAME}
       - name: Deploy porch kpt pkg
-        run: |
-          export IMAGE_TAG=${{ needs.build.outputs.image-tag }}
-          export SKIP_IMG_BUILD=true
-          make ${{ matrix.make_target }}
+        run: IMAGE_TAG=${{ needs.build.outputs.image-tag }} SKIP_IMG_BUILD=true make ${{ matrix.make_target }}
       - name: Run E2E tests
         run: ${{ matrix.test_env }} go test -v -timeout 20m ${{ matrix.test_path }}
       - name: Export porch server logs

make/deploy.mk

@@ -19,7 +19,7 @@ export SKIP_IMG_BUILD ?= false
 export SKIP_PORCHSERVER_BUILD ?= false
 export SKIP_CONTROLLER_BUILD ?= false
 export SKIP_LOCAL_GIT ?= false
-export IMAGE_TAG ?= test
+
 
 # Porch cache type: CR (Custom Resource) || DB (Database)
 export PORCH_CACHE_TYPE ?= CR
@@ -43,52 +43,44 @@ endif
 
 .PHONY: run-in-kind
 run-in-kind: IMAGE_REPO=porch-kind## Build and deploy porch into a kind cluster
-run-in-kind: IMAGE_TAG?=test
 run-in-kind: PORCH_CACHE_TYPE=CR
 run-in-kind: load-images-to-kind deployment-config deploy-current-config
 
 .PHONY: run-in-kind-db-cache
 run-in-kind-db-cache: IMAGE_REPO=porch-kind## Build and deploy porch into a kind cluster with postgres backend
-run-in-kind-db-cache: IMAGE_TAG?=test
 run-in-kind-db-cache: PORCH_CACHE_TYPE=DB
 run-in-kind-db-cache: load-images-to-kind deployment-config deploy-current-config
 
 .PHONY: run-in-kind-no-git
 run-in-kind-no-git: IMAGE_REPO=porch-kind## Build and deploy porch into a kind cluster without mock git server
-run-in-kind-no-git: IMAGE_TAG?=test
 run-in-kind-no-git: SKIP_LOCAL_GIT=true
 run-in-kind-no-git: PORCH_CACHE_TYPE=CR
 run-in-kind-no-git: load-images-to-kind deployment-config deploy-current-config
 
 .PHONY: run-in-kind-db-cache-no-git
 run-in-kind-db-cache-no-git: IMAGE_REPO=porch-kind## Build and deploy porch into a kind cluster with postgres backend without mock git server
-run-in-kind-db-cache-no-git: IMAGE_TAG?=test
 run-in-kind-db-cache-no-git: SKIP_LOCAL_GIT=true
 run-in-kind-db-cache-no-git: PORCH_CACHE_TYPE=DB
 run-in-kind-db-cache-no-git: load-images-to-kind deployment-config deploy-current-config
 
 .PHONY: run-in-kind-no-server
 run-in-kind-no-server: IMAGE_REPO=porch-kind## Build and deploy porch without the porch-server into a kind cluster
-run-in-kind-no-server: IMAGE_TAG?=test
 run-in-kind-no-server: SKIP_PORCHSERVER_BUILD=true
 run-in-kind-no-server: PORCH_CACHE_TYPE=CR
 run-in-kind-no-server: load-images-to-kind deployment-config-no-server deploy-current-config
 
 .PHONY: run-in-kind-db-cache-no-server
 run-in-kind-db-cache-no-server: IMAGE_REPO=porch-kind## Build and deploy porch into a kind cluster with postgres backend without the porch-server
-run-in-kind-db-cache-no-server: IMAGE_TAG?=test
 run-in-kind-db-cache-no-server: PORCH_CACHE_TYPE=DB
 run-in-kind-db-cache-no-server: load-images-to-kind deployment-config-no-server deploy-current-config
 
 .PHONY: run-in-kind-no-controller
 run-in-kind-no-controller: IMAGE_REPO=porch-kind## Build and deploy porch without the controllers into a kind cluster
-run-in-kind-no-controller: IMAGE_TAG?=test
 run-in-kind-no-controller: SKIP_CONTROLLER_BUILD=true
 run-in-kind-no-controller: load-images-to-kind deployment-config-no-controller deploy-current-config
 
 .PHONY: run-in-kind-db-cache-no-controller
 run-in-kind-db-cache-no-controller: IMAGE_REPO=porch-kind## Build and deploy porch without the controllers into a kind cluster with postgres backend
-run-in-kind-db-cache-no-controller: IMAGE_TAG?=test
 run-in-kind-db-cache-no-controller: SKIP_CONTROLLER_BUILD=true
 run-in-kind-db-cache-no-controller: PORCH_CACHE_TYPE=DB
 run-in-kind-db-cache-no-controller: load-images-to-kind deployment-config-no-controller deploy-current-config
@@ -124,19 +116,16 @@ deploy-current-config:## Deploy the configuration that is currently in $(DEPLOYP
 
 .PHONY: reload-function-runner
 reload-function-runner: IMAGE_REPO=porch-kind## Rebuild and reload function-runner in kind cluster
-reload-function-runner: IMAGE_TAG?=test
 reload-function-runner:
 	./scripts/reload-component.sh function-runner
 
 .PHONY: reload-server
 reload-server: IMAGE_REPO=porch-kind## Rebuild and reload porch-server in kind cluster
-reload-server: IMAGE_TAG?=test
 reload-server:
 	./scripts/reload-component.sh server
 
 .PHONY: reload-controllers
 reload-controllers: IMAGE_REPO=porch-kind## Rebuild and reload porch-controllers in kind cluster
-reload-controllers: IMAGE_TAG?=test
 reload-controllers:
 	./scripts/reload-component.sh controllers
 

scripts/common.sh

@@ -3,10 +3,7 @@
 # NOTE: Users should use root Makefile targets instead of calling scripts directly
 
 # Only set defaults if variables are not already exported from Makefile
-echo "DEBUG common.sh: IMAGE_TAG before fallback=${IMAGE_TAG}"
 IMAGE_REPO=${IMAGE_REPO:-docker.io/nephio}
-IMAGE_TAG=${IMAGE_TAG:-latest}
-echo "DEBUG common.sh: IMAGE_TAG after fallback=${IMAGE_TAG}"
 
 PORCH_SERVER_IMAGE=${PORCH_SERVER_IMAGE:-porch-server}
 PORCH_CONTROLLERS_IMAGE=${PORCH_CONTROLLERS_IMAGE:-porch-controllers}

scripts/create-deployment-config.sh

@@ -21,8 +21,6 @@ set -e
 source "$(dirname "$0")/common.sh"
 
 echo "Creating deployment configuration..."
-echo "DEBUG: IMAGE_TAG=${IMAGE_TAG}"
-echo "DEBUG: IMAGE_REPO=${IMAGE_REPO}"
 
 rm -rf "${DEPLOYPORCHCONFIGDIR}" || true
 mkdir -p "${DEPLOYPORCHCONFIGDIR}"