From f1160d30602116852352445f3448b907e051b392 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Wed, 20 Dec 2023 10:42:18 -0700 Subject: [PATCH 1/3] update to 1.26.12 for december 2023 Signed-off-by: Brian Downs --- .drone.yml | 2 +- Dockerfile | 4 ++-- scripts/version.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4e301af081..4d3ae1ad68 100644 --- 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.11b1 + image: rancher/hardened-build-base:v1.20.12b1 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - DRONE_TAG=${DRONE_TAG} make publish-image-runtime diff --git a/Dockerfile b/Dockerfile index cd4e4cbd45..4c44ea4b5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG KUBERNETES_VERSION=dev # Build environment -FROM rancher/hardened-build-base:v1.20.11b1 AS build +FROM rancher/hardened-build-base:v1.20.12b1 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.11-rke2r1-build20231115 AS kubernetes +FROM rancher/hardened-kubernetes:v1.26.12-rke2r1-build20231115 AS kubernetes FROM rancher/hardened-containerd:v1.7.11-k3s2-build20231211 AS containerd FROM rancher/hardened-crictl:v1.26.1-build20230406 AS crictl FROM rancher/hardened-runc:v1.1.10-build20231208 AS runc diff --git a/scripts/version.sh b/scripts/version.sh index 92025f588f..e98846a5c8 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.11} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.26.11-rke2r1-build20231115} +KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.26.12} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.26.12-rke2r1-build20231220} ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} CCM_VERSION=${CCM_VERSION:-v1.26.3-build20230406} From 51a8b3519c1135a822b584daefbf9f230c3781f2 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Wed, 20 Dec 2023 13:34:12 -0700 Subject: [PATCH 2/3] update go Signed-off-by: Brian Downs --- .drone.yml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4d3ae1ad68..a706a4df7c 100644 --- 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.12b1 + image: rancher/hardened-build-base:v1.20.12b2 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - DRONE_TAG=${DRONE_TAG} make publish-image-runtime diff --git a/Dockerfile b/Dockerfile index 4c44ea4b5b..18bb93f948 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG KUBERNETES_VERSION=dev # Build environment -FROM rancher/hardened-build-base:v1.20.12b1 AS build +FROM rancher/hardened-build-base:v1.20.12b2 AS build ARG DAPPER_HOST_ARCH ENV ARCH $DAPPER_HOST_ARCH RUN set -x \ From cc64e6f205a6f56cec06246a837e072c54c1e090 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Wed, 20 Dec 2023 13:46:16 -0700 Subject: [PATCH 3/3] update image Signed-off-by: Brian Downs --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 18bb93f948..7f79bb989e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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.12-rke2r1-build20231115 AS kubernetes +FROM rancher/hardened-kubernetes:v1.26.12-rke2r1-build20231220 AS kubernetes FROM rancher/hardened-containerd:v1.7.11-k3s2-build20231211 AS containerd FROM rancher/hardened-crictl:v1.26.1-build20230406 AS crictl FROM rancher/hardened-runc:v1.1.10-build20231208 AS runc