From f7ea810a6c10ec23cbfe95fac023231d7a9736e9 Mon Sep 17 00:00:00 2001 From: Noe Luaces Date: Tue, 1 Sep 2026 22:15:20 +0200 Subject: [PATCH 1/2] WIP: adding the correct image tag for e2e tests --- .circleci/config.yml | 6 ++++++ Makefile | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8ca947b88..8aaa8b563 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -285,12 +285,18 @@ jobs: name: Cluster East command: | set -x + IMAGE_TAG=$(make -s print-IMAGE_TAG) \ + SKUPPER_ROUTER_IMAGE_TAG=$(make -s print-ROUTER_IMAGE_TAG) \ + REGISTRY=$(make -s print-REGISTRY) \ KUBECONFIG=~/kc.east ./scripts/kind-dev-cluster -n east \ --images ociarchive - run: name: Cluster West command: | set -x + IMAGE_TAG=$(make -s print-IMAGE_TAG) \ + SKUPPER_ROUTER_IMAGE_TAG=$(make -s print-ROUTER_IMAGE_TAG) \ + REGISTRY=$(make -s print-REGISTRY) \ KUBECONFIG=~/kc.west ./scripts/kind-dev-cluster -n west \ --images ociarchive - run: diff --git a/Makefile b/Makefile index e7f1ddfc0..65b241b92 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,8 @@ GOOS ?= linux GOARCH ?= amd64 REGISTRY := quay.io/skupper -IMAGE_TAG := v2-dev -ROUTER_IMAGE_TAG := main +IMAGE_TAG := 2.2.2 +ROUTER_IMAGE_TAG := 3.5.2 PLATFORMS ?= linux/amd64,linux/arm64 CONTAINERFILES := Dockerfile.cli Dockerfile.kube-adaptor Dockerfile.controller Dockerfile.network-observer Dockerfile.system-controller GO_IMAGE_BASE_TAG := 1.25 @@ -208,6 +208,9 @@ generate-network-observer-devel: --set extraArgs={"-cors-allow-all"} \ --set skipManagementLabels=true > skupper-network-observer-devel.yaml +print-%: + @echo $($*) + clean: rm -rf skupper controller kube-adaptor \ network-observer generate-doc \ From 5067bcadaaa56e944d167717e1e6ed72fd529ac2 Mon Sep 17 00:00:00 2001 From: Noe Luaces Date: Tue, 1 Sep 2026 22:23:55 +0200 Subject: [PATCH 2/2] fix image tags --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 65b241b92..c8d2b523c 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,8 @@ GOOS ?= linux GOARCH ?= amd64 REGISTRY := quay.io/skupper -IMAGE_TAG := 2.2.2 -ROUTER_IMAGE_TAG := 3.5.2 +IMAGE_TAG := v2-dev +ROUTER_IMAGE_TAG := main PLATFORMS ?= linux/amd64,linux/arm64 CONTAINERFILES := Dockerfile.cli Dockerfile.kube-adaptor Dockerfile.controller Dockerfile.network-observer Dockerfile.system-controller GO_IMAGE_BASE_TAG := 1.25