From a95a55e447c24a56aa4357432f03313f8cba5e14 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Wed, 17 Jan 2024 14:57:42 -0700 Subject: [PATCH 1/3] update to 1.27.10 Signed-off-by: Brian Downs --- .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 2a0faf2890..7b35b352bf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -136,7 +136,7 @@ steps: - refs/tags/* - name: publish-image-runtime - image: rancher/hardened-build-base:v1.20.12b2 + image: rancher/hardened-build-base:v1.21.6b2 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - DRONE_TAG=${DRONE_TAG} make publish-image-runtime @@ -312,7 +312,7 @@ steps: - refs/tags/* - name: publish-image-runtime - image: rancher/hardened-build-base:v1.20.12b2 + image: rancher/hardened-build-base:v1.21.6b2 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - DRONE_TAG=${DRONE_TAG} make publish-image-runtime diff --git a/Dockerfile b/Dockerfile index f99ea6ce30..a78c2732a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG KUBERNETES_VERSION=dev # Build environment -FROM rancher/hardened-build-base:v1.20.12b2 AS build +FROM rancher/hardened-build-base:v1.21.6b2 AS build ARG DAPPER_HOST_ARCH ENV ARCH $DAPPER_HOST_ARCH RUN set -x && \ @@ -113,7 +113,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.27.9-rke2r1-build20231220 AS kubernetes +FROM rancher/hardened-kubernetes:v1.27.10-rke2r1-build20240117 AS kubernetes FROM rancher/hardened-containerd:v1.7.11-k3s2-build20231211 AS containerd FROM rancher/hardened-crictl:v1.26.1-build20230606 AS crictl FROM rancher/hardened-runc:v1.1.10-build20231208 AS runc diff --git a/scripts/version.sh b/scripts/version.sh index eabc64d8c9..ca092bac68 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.27.9} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.27.9-rke2r1-build20231220} +KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.27.10} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.27.10-rke2r1-build20240117} ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} CCM_VERSION=${CCM_VERSION:-v1.28.2-build20231016} From 449a41ed8be8a5a7e964ffabd4651c5b3ad4034e Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Wed, 17 Jan 2024 15:02:33 -0700 Subject: [PATCH 2/3] update go version Signed-off-by: Brian Downs --- .drone.yml | 4 ++-- Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7b35b352bf..1b23565f17 100644 --- a/.drone.yml +++ b/.drone.yml @@ -136,7 +136,7 @@ steps: - refs/tags/* - name: publish-image-runtime - image: rancher/hardened-build-base:v1.21.6b2 + image: rancher/hardened-build-base:v1.20.13b2 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - DRONE_TAG=${DRONE_TAG} make publish-image-runtime @@ -312,7 +312,7 @@ steps: - refs/tags/* - name: publish-image-runtime - image: rancher/hardened-build-base:v1.21.6b2 + image: rancher/hardened-build-base:v1.20.13b2 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - DRONE_TAG=${DRONE_TAG} make publish-image-runtime diff --git a/Dockerfile b/Dockerfile index a78c2732a5..bc55ae8506 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG KUBERNETES_VERSION=dev # Build environment -FROM rancher/hardened-build-base:v1.21.6b2 AS build +FROM rancher/hardened-build-base:v1.20.13b2 AS build ARG DAPPER_HOST_ARCH ENV ARCH $DAPPER_HOST_ARCH RUN set -x && \ From 240643245af9e9d3f6cb6a339883ae37155f434e Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Wed, 17 Jan 2024 15:27:17 -0700 Subject: [PATCH 3/3] update go version Signed-off-by: Brian Downs --- .drone.yml | 4 ++-- Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1b23565f17..c687a329fc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -136,7 +136,7 @@ steps: - refs/tags/* - name: publish-image-runtime - image: rancher/hardened-build-base:v1.20.13b2 + image: rancher/hardened-build-base:v1.20.13b1 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - DRONE_TAG=${DRONE_TAG} make publish-image-runtime @@ -312,7 +312,7 @@ steps: - refs/tags/* - name: publish-image-runtime - image: rancher/hardened-build-base:v1.20.13b2 + image: rancher/hardened-build-base:v1.20.13b1 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - DRONE_TAG=${DRONE_TAG} make publish-image-runtime diff --git a/Dockerfile b/Dockerfile index bc55ae8506..56f938d46a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG KUBERNETES_VERSION=dev # Build environment -FROM rancher/hardened-build-base:v1.20.13b2 AS build +FROM rancher/hardened-build-base:v1.20.13b1 AS build ARG DAPPER_HOST_ARCH ENV ARCH $DAPPER_HOST_ARCH RUN set -x && \