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

Remove Build meta from kubernetes image versioning #54

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Remove Build meta from kubernetes image versioning #54

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa57de0
Remove Build meta from kubernetes image versioning
galal-hussein Mar 6, 2024
ae8fe1a
Use recent k8s version for build PRs
galal-hussein Mar 11, 2024
35f6fff
Revert the removal of rke2r suffix build meta
galal-hussein Mar 11, 2024
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: 1 addition & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,13 @@ SRC ?= github.com/kubernetes/kubernetes
TAG ?= ${DRONE_TAG}
K3S_ROOT_VERSION ?= v0.13.0

BUILD_META := -build$(shell date +%Y%m%d)

ifeq ($(TAG),)
TAG := v1.26.3-rke2dev$(BUILD_META)
TAG := v1.29.0-1
endif

GOLANG_VERSION := $(shell ./scripts/golang-version.sh $(TAG))

ifeq (,$(filter %$(BUILD_META),$(TAG)))
$(error TAG needs to end with build metadata: $(BUILD_META))
endif

.PHONY: image-build
image-build:
docker build \
Expand Down
2 changes: 1 addition & 1 deletion scripts/semver-parse.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ PATCH=""
RC=""
RKE2_PATCH=""

if [[ "${TAG}" =~ ^v([0-9]+)\.([0-9]+)\.([0-9]+)([-+][a-zA-Z0-9.]+)?[-+](rke2(r[0-9]+|dev)).*$ ]]; then
if [[ "${TAG}" =~ ^v([0-9]+)\.([0-9]+)\.([0-9]+)([-+][a-zA-Z0-9.]+)?[-+]([0-9]+).*$ ]]; then
MAJOR=${BASH_REMATCH[1]}
MINOR=${BASH_REMATCH[2]}
PATCH=${BASH_REMATCH[3]}
Expand Down