update go to 1.21.11 and kubernetes to v1.29.6 (#6190)

Signed-off-by: Brooks Newberry <[email protected]>
rancher · Jun 13, 2024 · 63a723a · 63a723a
1 parent 0c6c6ff
commit 63a723a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -136,7 +136,7 @@ steps:
  - refs/tags/*
 
  - name: publish-image-runtime
- image: rancher/hardened-build-base:v1.21.9b1
+ image: rancher/hardened-build-base:v1.21.11b2
  commands:
  - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
  - DRONE_TAG=${DRONE_TAG} make publish-image-runtime
@@ -312,7 +312,7 @@ steps:
  - refs/tags/*
 
  - name: publish-image-runtime
- image: rancher/hardened-build-base:v1.21.9b1
+ image: rancher/hardened-build-base:v1.21.11b2
  commands:
  - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
  - DRONE_TAG=${DRONE_TAG} make publish-image-runtime

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 ARG KUBERNETES_VERSION=dev
 
 # Build environment
-FROM rancher/hardened-build-base:v1.21.9b1 AS build
+FROM rancher/hardened-build-base:v1.21.11b2 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.29.5-rke2r1-build20240515 AS kubernetes
+FROM rancher/hardened-kubernetes:v1.29.6-rke2r1-build20240612 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
@@ -1,6 +1,6 @@
 module github.com/rancher/rke2
 
-go 1.21.9
+go 1.21.11
 
 replace (
  github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.11.1

diff --git a/scripts/version.sh b/scripts/version.sh
@@ -31,8 +31,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.29.5}
-KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.29.5-rke2r1-build20240515}
+KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.29.6}
+KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.29.6-rke2r1-build20240612}
 ETCD_VERSION=${ETCD_VERSION:-v3.5.13-k3s1}
 PAUSE_VERSION=${PAUSE_VERSION:-3.6}
 CCM_VERSION=${CCM_VERSION:-v1.29.3-build20240515}