From 41a88ab389d6479ee1a8254521668279900449d4 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Wed, 19 Jul 2023 13:44:23 -0700 Subject: [PATCH] update versions 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 3c8a9f6455..d472acd1d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -138,7 +138,7 @@ RUN rm -vf /charts/*.sh /charts/*.md # 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.6-rke2r1-build20230614 AS kubernetes +FROM rancher/hardened-kubernetes:v1.26.7-rke2r1-build202306719 AS kubernetes FROM rancher/hardened-containerd:v1.7.1-k3s1-build20230511 AS containerd FROM rancher/hardened-crictl:v1.26.1-build20230406 AS crictl FROM rancher/hardened-runc:v1.1.7-build20230511 AS runc diff --git a/scripts/version.sh b/scripts/version.sh index b26d3e9ab4..157fdfdc95 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.26.6} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.26.6-rke2r1-build20230614} +KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.26.7} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.26.7-rke2r1-build20230719} ETCD_VERSION=${ETCD_VERSION:-v3.5.7-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} CCM_VERSION=${CCM_VERSION:-v1.26.3-build20230406}