From 35d29f59db562be151ebaa94ed6e68c158c91828 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Fri, 15 Mar 2024 13:50:34 -0700 Subject: [PATCH 1/2] update k8s to 1.29.3 and Go Signed-off-by: Brian Downs --- .drone.yml | 4 ++-- Dockerfile | 2 +- scripts/version.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 858985966d..7718c0dec4 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.7b1 + image: rancher/hardened-build-base:8b1 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.7b1 + image: rancher/hardened-build-base:v1.21.8b1 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - DRONE_TAG=${DRONE_TAG} make publish-image-runtime diff --git a/Dockerfile b/Dockerfile index 8ff61737b6..f056b42244 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG KUBERNETES_VERSION=dev # Build environment -FROM rancher/hardened-build-base:v1.21.7b1 AS build +FROM rancher/hardened-build-base:v1.21.8b1 AS build ARG DAPPER_HOST_ARCH ENV ARCH $DAPPER_HOST_ARCH RUN set -x && \ diff --git a/scripts/version.sh b/scripts/version.sh index 40da47728c..a3b93f998d 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.29.2} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.29.2-rke2r1-build20240214} +KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.29.3} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.29.3-rke2r1-build20240315} ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} CCM_VERSION=${CCM_VERSION:-v1.28.2-build20231016} From a07cfa5116dbd840de353ee0184df3e438c6734b Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Fri, 15 Mar 2024 15:05:01 -0700 Subject: [PATCH 2/2] Update .drone.yml Co-authored-by: Brooks Newberry --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 7718c0dec4..d2e33f6bdb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -136,7 +136,7 @@ steps: - refs/tags/* - name: publish-image-runtime - image: rancher/hardened-build-base:8b1 + image: rancher/hardened-build-base:v1.21.8b1 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - DRONE_TAG=${DRONE_TAG} make publish-image-runtime