From 760de1e9851f5af9782a9437b2e9cc49c1f743f9 Mon Sep 17 00:00:00 2001 From: Brooks Newberry Date: Wed, 22 Nov 2023 09:15:06 -0800 Subject: [PATCH] [release-1.25] Kubernetes patch release (#5063) Signed-off-by: Brooks Newberry --- .drone.yml | 4 ++-- Dockerfile | 4 ++-- scripts/version.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index a005b8ea7a..94b7a04238 100644 --- a/.drone.yml +++ b/.drone.yml @@ -96,7 +96,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 @@ -191,7 +191,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 index e69207e856..5c4ad72758 100644 --- 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.25.15-rke2r2-build20231102 AS kubernetes +FROM rancher/hardened-kubernetes:v1.25.16-rke2r1-build20231116 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 index 19ecb89f05..e2b34cd59d 100755 --- 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.25.15} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.25.15-rke2r2-build20231102} +KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.25.16} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.25.16-rke2r1-build20231116} ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} CCM_VERSION=${CCM_VERSION:-v1.26.3-build20230406}