From 68bf121fbb8cb186a17cedd526530225d393bab7 Mon Sep 17 00:00:00 2001 From: ekarlso Date: Fri, 18 Aug 2023 22:53:50 +0200 Subject: [PATCH] Fix release tagging --- .github/workflows/release.yaml | 7 ++++--- Makefile | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7d5774db..c1b553a1 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -113,9 +113,10 @@ jobs: tags: type=ref,event=tag - name: manifest - run: make release-${{ matrix.target }} - env: - TAG: ${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }} + run: | + BOOTSTRAP_IMG_TAG=$RELEASE_TAG + CONTROLPLANE_IMG_TAG=$RELEASE_TAG + make release - name: Generate Release Notes run: | diff --git a/Makefile b/Makefile index 5f6a0aa6..2c5c9658 100644 --- a/Makefile +++ b/Makefile @@ -43,10 +43,12 @@ $(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:v0.2.0 # Image URL to use all building/pushing image targets -CONTROLPLANE_IMG ?= ghcr.io/cluster-api-provider-k3s/cluster-api-k3s/controlplane-controller:v0.2.0 +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)