Skip to content

Commit c1a3b66

Browse files
committed
fix(cluster-async-router-eg): align Makefile image variable names with CI convention
DEMO_IMAGE/PUBLISH_DEMO_IMAGE didn't match the CONTROL_PLANE_IMAGE/ PUBLISH_CONTROL_PLANE_IMAGE variables the CI passes, so the demo image defaulted to a local tag that k3d couldn't pull, causing upstream-a pods to never become Ready.
1 parent 656e3e7 commit c1a3b66

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

  • integrations/cluster-async-router-eg

integrations/cluster-async-router-eg/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ ENVOY_GATEWAY_VERSION ?= v1.8.0
1717
K3S_TAG ?= v1.31.6-k3s1
1818
IMAGE_TAG := $(shell date +%s)
1919
IMAGE ?= transit-cluster-async-router-eg:$(IMAGE_TAG)
20-
DEMO_IMAGE ?= transit-cluster-async-router-eg-demo:$(IMAGE_TAG)
20+
CONTROL_PLANE_IMAGE ?= transit-cluster-async-router-eg-demo:$(IMAGE_TAG)
2121
PUBLISH_IMAGE ?= ttl.sh/transit-cluster-async-router-eg-$(IMAGE_TAG):1h
22-
PUBLISH_DEMO_IMAGE ?= ttl.sh/transit-cluster-async-router-eg-demo-$(IMAGE_TAG):1h
22+
PUBLISH_CONTROL_PLANE_IMAGE ?= ttl.sh/transit-cluster-async-router-eg-demo-$(IMAGE_TAG):1h
2323
K3D_IMAGE_IMPORT_MODE ?= direct
2424
K3D_SKIP_IMAGE_IMPORT ?= 0
2525
K3D_AGENTS ?= 0
@@ -62,13 +62,13 @@ demo-image: demo-binary
6262
docker build --platform $(PLATFORM) \
6363
--build-arg TARGETARCH=$(ARCH) \
6464
-f Dockerfile.demo \
65-
-t $(DEMO_IMAGE) .
65+
-t $(CONTROL_PLANE_IMAGE) .
6666

6767
publish: IMAGE=$(PUBLISH_IMAGE)
68-
publish: DEMO_IMAGE=$(PUBLISH_DEMO_IMAGE)
68+
publish: CONTROL_PLANE_IMAGE=$(PUBLISH_CONTROL_PLANE_IMAGE)
6969
publish: image demo-image
7070
docker push $(IMAGE)
71-
docker push $(DEMO_IMAGE)
71+
docker push $(CONTROL_PLANE_IMAGE)
7272

7373
eg-install:
7474
RUN_CLUSTER_ASYNC_ROUTER_EG_INSTALL=1 \
@@ -92,7 +92,7 @@ e2e: image demo-image
9292
endif
9393
RUN_CLUSTER_ASYNC_ROUTER_EG_E2E=1 \
9494
IMAGE=$(IMAGE) \
95-
DEMO_IMAGE=$(DEMO_IMAGE) \
95+
DEMO_IMAGE=$(CONTROL_PLANE_IMAGE) \
9696
ENVOY_GATEWAY_VERSION=$(ENVOY_GATEWAY_VERSION) \
9797
K3S_TAG=$(K3S_TAG) \
9898
K3D_AGENTS=$(K3D_AGENTS) \

0 commit comments

Comments
 (0)