From 5de51004a941b88cbc0e15f8b0e18bf0a64c2e6a Mon Sep 17 00:00:00 2001 From: Brooks Newberry Date: Wed, 13 Sep 2023 12:25:02 -0700 Subject: [PATCH] update to kubernetes v1.28.2 and go v1.20.8 Signed-off-by: Brooks Newberry --- .drone.yml | 20 ++++++++++---------- Dockerfile | 4 ++-- scripts/version.sh | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.drone.yml b/.drone.yml index 61d782130b..cfd229036f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -32,7 +32,7 @@ steps: - name: validate-release image: rancher/dapper:v0.5.5 commands: - - docker pull --quiet rancher/hardened-build-base:v1.20.4b11 + - docker pull --quiet rancher/hardened-build-base:v1.20.8b2 - dapper -f Dockerfile --target dapper make validate-release volumes: - name: docker @@ -52,7 +52,7 @@ steps: AWS_SECRET_ACCESS_KEY: from_secret: AWS_SECRET_ACCESS_KEY-rke2-ci-uploader commands: - - docker pull --quiet rancher/hardened-build-base:v1.20.4b11 + - docker pull --quiet rancher/hardened-build-base:v1.20.8b2 - docker pull --quiet alpine:3.17 - dapper -f Dockerfile --target dapper make dapper-ci volumes: @@ -88,7 +88,7 @@ steps: - name: package-images image: rancher/dapper:v0.5.5 commands: - - docker pull --quiet rancher/hardened-build-base:v1.20.4b11 + - docker pull --quiet rancher/hardened-build-base:v1.20.8b2 - dapper -f Dockerfile --target dapper make package-images volumes: - name: docker @@ -139,7 +139,7 @@ steps: - refs/tags/* - name: publish-image-runtime - image: rancher/hardened-build-base:v1.20.4b11 + image: rancher/hardened-build-base:v1.20.8b2 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - DRONE_TAG=${DRONE_TAG} make publish-image-runtime @@ -163,7 +163,7 @@ steps: - name: package-windows-images image: rancher/dapper:v0.5.5 commands: - - docker pull --quiet rancher/hardened-build-base:v1.20.4b11 + - docker pull --quiet rancher/hardened-build-base:v1.20.8b2 - dapper -f Dockerfile --target dapper make package-windows-images when: event: @@ -234,7 +234,7 @@ steps: - name: validate-release image: rancher/dapper:v0.5.5 commands: - - docker pull --quiet rancher/hardened-build-base:v1.20.4b11 + - docker pull --quiet rancher/hardened-build-base:v1.20.8b2 - dapper -f Dockerfile --target dapper make validate-release volumes: - name: docker @@ -254,7 +254,7 @@ steps: AWS_SECRET_ACCESS_KEY: from_secret: AWS_SECRET_ACCESS_KEY-rke2-ci-uploader commands: - - docker pull --quiet rancher/hardened-build-base:v1.20.4b11 + - docker pull --quiet rancher/hardened-build-base:v1.20.8b2 - docker pull --quiet alpine:3.17 - dapper -f Dockerfile --target dapper make dapper-ci volumes: @@ -290,7 +290,7 @@ steps: - name: package-images image: rancher/dapper:v0.5.5 commands: - - docker pull --quiet rancher/hardened-build-base:v1.20.4b11 + - docker pull --quiet rancher/hardened-build-base:v1.20.8b2 - dapper -f Dockerfile --target dapper make package-images volumes: - name: docker @@ -319,7 +319,7 @@ steps: - refs/tags/* - name: publish-image-runtime - image: rancher/hardened-build-base:v1.20.4b11 + image: rancher/hardened-build-base:v1.20.8b2 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - DRONE_TAG=${DRONE_TAG} make publish-image-runtime @@ -428,7 +428,7 @@ steps: - drone-publish.rancher.io - name: publish-image-runtime - image: rancher/hardened-build-base:v1.20.4b11 + image: rancher/hardened-build-base:v1.20.8b2 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - DRONE_TAG=${DRONE_TAG} make publish-image-runtime diff --git a/Dockerfile b/Dockerfile index 6843e7f883..9dcaeae5b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG KUBERNETES_VERSION=dev # Build environment -FROM rancher/hardened-build-base:v1.20.7b3 AS build +FROM rancher/hardened-build-base:v1.20.8b2 AS build ARG DAPPER_HOST_ARCH ENV ARCH $DAPPER_HOST_ARCH RUN set -x && \ @@ -126,7 +126,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.28.1-rke2r1-build20230825 AS kubernetes +FROM rancher/hardened-kubernetes:v1.28.2-rke2r1-build20230913 AS kubernetes FROM rancher/hardened-containerd:v1.7.3-k3s1-build20230802 AS containerd FROM rancher/hardened-crictl:v1.26.1-build20230606 AS crictl FROM rancher/hardened-runc:v1.1.8-build20230802 AS runc diff --git a/scripts/version.sh b/scripts/version.sh index 9c0a177553..d95ab7307b 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.28.1} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.28.1-rke2r1-build20230825} +KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.28.2} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.28.2-rke2r1-build20230913} ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} CCM_VERSION=${CCM_VERSION:-v1.26.3-build20230608}