Use RELEASE_TAG

k3s-io · Sep 8, 2023 · c146edc · c146edc
1 parent c568ab9
commit c146edc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git 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
@@ -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