diff --git a/Dockerfile b/Dockerfile index c27c073d65..15c035b2ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG KUBERNETES_VERSION=dev # Build environment -FROM rancher/hardened-build-base:v1.22.4b1 AS build +FROM rancher/hardened-build-base:v1.22.5b1 AS build ARG DAPPER_HOST_ARCH ENV ARCH $DAPPER_HOST_ARCH RUN set -x && \ @@ -113,7 +113,7 @@ RUN rm -vf /charts/*.sh /charts/*.md /charts/chart_versions.yaml # This image includes any host level programs that we might need. All binaries # must be placed in bin/ of the file image and subdirectories of bin/ will be flattened during installation. # This means bin/foo/bar will become bin/bar when rke2 installs this to the host -FROM rancher/hardened-kubernetes:v1.30.2-rke2r1-build20240619 AS kubernetes +FROM rancher/hardened-kubernetes:v1.30.3-rke2r1-build20240717 AS kubernetes FROM rancher/hardened-containerd:v1.7.17-k3s1-build20240605 AS containerd FROM rancher/hardened-crictl:v1.29.0-build20231219 AS crictl FROM rancher/hardened-runc:v1.1.12-build20240201 AS runc diff --git a/go.mod b/go.mod index cb2a39fc1b..6017489da4 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/rancher/rke2 -go 1.22.4 +go 1.22.5 replace ( github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.11.0 diff --git a/scripts/version.sh b/scripts/version.sh index a72eb2efd5..8b115be89e 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -32,8 +32,8 @@ REVISION=$(git rev-parse HEAD)$(if ! git diff --no-ext-diff --quiet --exit-code; PLATFORM=${GOOS}-${GOARCH} RELEASE=${PROG}.${PLATFORM} # hardcode versions unless set specifically -KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.30.2} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.30.2-rke2r1-build20240619} +KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.30.3} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.30.3-rke2r1-build20240717} ETCD_VERSION=${ETCD_VERSION:-v3.5.13-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} CCM_VERSION=${CCM_VERSION:-v1.29.3-build20240515}