From 19a51dd0235aeb2dd546e32e05a96732e9a1bfc7 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Thu, 21 Nov 2024 16:44:27 -0700 Subject: [PATCH 1/2] update upstream version Signed-off-by: Brian Downs --- Dockerfile | 2 +- scripts/version.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 98c8abeb51..5b40cf8098 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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.6-rke2r1-build20241023 AS kubernetes +FROM rancher/hardened-kubernetes:v1.30.7-rke2r1-build20241121 AS kubernetes FROM rancher/hardened-containerd:v1.7.23-k3s1-build20241106 AS containerd FROM rancher/hardened-crictl:v1.30.1-build20241008 AS crictl FROM rancher/hardened-runc:v1.1.14-build20240910 AS runc diff --git a/scripts/version.sh b/scripts/version.sh index 1aab467349..75a9d7a3d5 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.6} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.30.6-rke2r1-build20241023} +KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.30.7} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.30.7-rke2r1-build20241121} 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} From 53f3e8835f8716c7a0bb3fd1d58f66d3a20ad48f Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Tue, 26 Nov 2024 16:08:59 -0700 Subject: [PATCH 2/2] update k8s base version Signed-off-by: Brian Downs --- Dockerfile | 2 +- scripts/version.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5b40cf8098..f98120e81d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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.7-rke2r1-build20241121 AS kubernetes +FROM rancher/hardened-kubernetes:v1.30.7-rke2r1-build20241126 AS kubernetes FROM rancher/hardened-containerd:v1.7.23-k3s1-build20241106 AS containerd FROM rancher/hardened-crictl:v1.30.1-build20241008 AS crictl FROM rancher/hardened-runc:v1.1.14-build20240910 AS runc diff --git a/scripts/version.sh b/scripts/version.sh index 75a9d7a3d5..7079fb9825 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -33,7 +33,7 @@ PLATFORM=${GOOS}-${GOARCH} RELEASE=${PROG}.${PLATFORM} # hardcode versions unless set specifically KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.30.7} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.30.7-rke2r1-build20241121} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.30.7-rke2r1-build20241126} 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}