[release-1.26] Kubernetes patch release (#5064)

Signed-off-by: Brooks Newberry <[email protected]>
rancher · Nov 22, 2023 · 3f9afa7 · 3f9afa7
1 parent e5ab78e
commit 3f9afa7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -112,7 +112,7 @@ steps:
         path: /var/run/docker.sock
 
   - name: publish-image-runtime
-    image: rancher/hardened-build-base:v1.20.10b1
+    image: rancher/hardened-build-base:v1.20.11b1
     commands:
       - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
       - DRONE_TAG=${DRONE_TAG} make publish-image-runtime
@@ -223,7 +223,7 @@ steps:
         - drone-publish.rancher.io
 
   - name: publish-image-runtime
-    image: rancher/hardened-build-base:v1.20.10b1
+    image: rancher/hardened-build-base:v1.20.11b1
     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.20.10b1 AS build
+FROM rancher/hardened-build-base:v1.20.11b1 AS build
 ARG DAPPER_HOST_ARCH
 ENV ARCH $DAPPER_HOST_ARCH
 RUN set -x \
@@ -125,7 +125,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.26.10-rke2r2-build20231102 AS kubernetes
+FROM rancher/hardened-kubernetes:v1.26.11-rke2r1-build20231115 AS kubernetes
 FROM rancher/hardened-containerd:v1.7.7-k3s1-build20231010 AS containerd
 FROM rancher/hardened-crictl:v1.26.1-build20230406 AS crictl
 FROM rancher/hardened-runc:v1.1.8-build20230802 AS runc

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.26.10}
-KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.26.10-rke2r2-build20231102}
+KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.26.11}
+KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.26.11-rke2r1-build20231115}
 ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1}
 PAUSE_VERSION=${PAUSE_VERSION:-3.6}
 CCM_VERSION=${CCM_VERSION:-v1.26.3-build20230406}