From 4ab84d61ed71035b60745282fa74b8d61d5d5538 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Thu, 16 Jan 2025 14:23:21 -0700 Subject: [PATCH] update k8s (#7611) --- Dockerfile | 4 ++-- scripts/version.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6d27522d1d..09cd4ac448 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG KUBERNETES_VERSION=dev # Build environment -FROM rancher/hardened-build-base:v1.22.9b1 AS build +FROM rancher/hardened-build-base:v1.22.10b1 AS build ARG DAPPER_HOST_ARCH ENV ARCH $DAPPER_HOST_ARCH RUN set -x && \ @@ -117,7 +117,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.8-rke2r1-build20241212 AS kubernetes +FROM rancher/hardened-kubernetes:v1.30.9-rke2r1-build20250116 AS kubernetes FROM rancher/hardened-containerd:v1.7.23-k3s2-build20241203 AS containerd FROM rancher/hardened-crictl:v1.30.1-build20241008 AS crictl FROM rancher/hardened-runc:v1.2.4-build20250109 AS runc diff --git a/scripts/version.sh b/scripts/version.sh index c502324d5c..a97aee5356 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.8} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.30.8-rke2r1-build20241212} +KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.30.9} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.30.9-rke2r1-build20250116} ETCD_VERSION=${ETCD_VERSION:-v3.5.16-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} CCM_VERSION=${CCM_VERSION:-v1.30.6-0.20241016053533-5ec454f50e7a-build20241016}