Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix release tagging #47

Merged
merged 2 commits into from
Aug 22, 2023
Merged

Fix release tagging #47

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68bf121
Fix release tagging
Aug 18, 2023
734304d
Merge branch 'main' into fix-tag
ekarlso Aug 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
ekarlso marked this conversation as resolved.
Show resolved Hide resolved
CONTROLPLANE_IMG_TAG=$RELEASE_TAG
make release

- name: Generate Release Notes
run: |
Expand Down
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
ekarlso marked this conversation as resolved.
Show resolved Hide resolved
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)
Expand Down