Skip to content

Commit

Permalink
Bump default k8s versions
Browse files Browse the repository at this point in the history
Signed-off-by: Brad Davidson <[email protected]>
  • Loading branch information
brandond committed Feb 28, 2025
1 parent a01cb37 commit 1ef3dd2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BCI_IMAGE=registry.suse.com/bci/bci-base:15.5
ARG GO_IMAGE=rancher/hardened-build-base:v1.22.7b1
ARG GO_IMAGE=rancher/hardened-build-base:v1.23.6b1

FROM ${BCI_IMAGE} as bci
FROM ${GO_IMAGE} as build
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ K3S_ROOT_VERSION ?= v0.14.1
BUILD_META := -build$(shell date +%Y%m%d)

ifeq ($(TAG),)
TAG := v1.29.3-rke2dev$(BUILD_META)
TAG := v1.32.2-rke2dev$(BUILD_META)
endif

ARCH=
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

## Build
Build hardened kubernetes needs to include the rke2 release version and the build meta to work properly. Just running
`make` will hardcode `v1.21.2-rke2dev-build<todaysdate>`. If you want to set your own versions for testing and when
`make` will hardcode `v1.32.2-rke2dev-build<todaysdate>`. If you want to set your own versions for testing and when
pushing a tag to the repo to make a release you will want to add the full version of kubernetes rke2 release and
the build meta like the following.

```sh
TAG=v1.21.2-rke2r1-build20210706 make
TAG=v1.32.2-rke2r1-build$(TZ=UTC date +%Y%m%d) make
```

## Pushing a Release
You will need to know the RKE2 version you are releasing before you can build hardened kubernetes. For example a current
release is `v1.21.2+rke2r1` and this translates to a hardened kubernetes build tag of `v1.21.2-rke2r1-build<date Ymd>`.
Let this project build and release images and set your version in the [dockerfile](https://github.com/rancher/rke2/blob/master/Dockerfile)
release is `v1.32.2+rke2r1` and this translates to a hardened kubernetes build tag of `v1.32.2-rke2r1-build<date Ymd>`.
Let this project build and release images and set your version in the [dockerfile](https://github.com/rancher/rke2/blob/master/Dockerfile)

0 comments on commit 1ef3dd2

Please sign in to comment.