From c146edcf8f8d110ed822af56d9fe5865f9aece48 Mon Sep 17 00:00:00 2001 From: ekarlso Date: Fri, 8 Sep 2023 23:13:49 +0200 Subject: [PATCH] Use RELEASE_TAG --- .github/workflows/release.yaml | 2 -- Makefile | 15 +++++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index eebb6bfe..1b8eab18 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -127,8 +127,6 @@ jobs: - name: manifest run: | - BOOTSTRAP_IMG_TAG=$RELEASE_TAG - CONTROLPLANE_IMG_TAG=$RELEASE_TAG make release - name: manifest diff --git a/Makefile b/Makefile index 075674e3..7479958d 100644 --- a/Makefile +++ b/Makefile @@ -42,14 +42,6 @@ TOOLS_BIN_DIR := $(shell pwd)/$(BIN_DIR) $(TOOLS_BIN_DIR): mkdir -p $(TOOLS_BIN_DIR) -# Image URL to use all building/pushing image targets -BOOTSTRAP_IMG_TAG ?= v0.2.0 -BOOTSTRAP_IMG ?= ghcr.io/cluster-api-provider-k3s/cluster-api-k3s/bootstrap-controller:$(BOOTSTRAP_IMG_TAG) - -# Image URL to use all building/pushing image targets -CONTROLPLANE_IMG_TAG ?= v0.2.0 -CONTROLPLANE_IMG ?= ghcr.io/cluster-api-provider-k3s/cluster-api-k3s/controlplane-controller:$(CONTROLPLANE_IMG_TAG) - # Produce CRDs that work back to Kubernetes 1.11 (no version conversion) CRD_OPTIONS ?= "crd:trivialVersions=true" @@ -118,6 +110,13 @@ $(RELEASE_DIR): $(RELEASE_NOTES_DIR): mkdir -p $(RELEASE_NOTES_DIR)/ +# Image URL to use all building/pushing image targets +BOOTSTRAP_IMG_TAG ?= $(RELEASE_TAG) +BOOTSTRAP_IMG ?= ghcr.io/cluster-api-provider-k3s/cluster-api-k3s/bootstrap-controller:$(BOOTSTRAP_IMG_TAG) + +# Image URL to use all building/pushing image targets +CONTROLPLANE_IMG_TAG ?= $(RELEASE_TAG) +CONTROLPLANE_IMG ?= ghcr.io/cluster-api-provider-k3s/cluster-api-k3s/controlplane-controller:$(CONTROLPLANE_IMG_TAG) all-bootstrap: manager-bootstrap