From a30c511ca79410e50c0daba2b816cb4e2a7bdfad Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Wed, 17 Jan 2024 15:08:05 -0700 Subject: [PATCH 1/2] update to 1.29.1 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 ae51f59363..a14961e591 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.5b2 + 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.21.5b2 + 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 7877ada366..ed158fe03c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG KUBERNETES_VERSION=dev # Build environment -FROM rancher/hardened-build-base:v1.21.5b2 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.29.0-rke2r1-build20231213 AS kubernetes +FROM rancher/hardened-kubernetes:v1.29.1-rke2r1-build20240117 AS kubernetes FROM rancher/hardened-containerd:v1.7.11-k3s2-build20231211 AS containerd FROM rancher/hardened-crictl:v1.29.0-build20231219 AS crictl FROM rancher/hardened-runc:v1.1.10-build20231208 AS runc diff --git a/scripts/version.sh b/scripts/version.sh index 1e73532623..40ab181aa4 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.0} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.29.0-rke2r1-build20231213} +KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.29.1} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.29.1-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 e09ca72b49b426d50f65862cd445d5c9746e7053 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Wed, 17 Jan 2024 15:47:38 -0700 Subject: [PATCH 2/2] 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 a14961e591..a78349adcb 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.21.6b1 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.21.6b1 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - DRONE_TAG=${DRONE_TAG} make publish-image-runtime diff --git a/Dockerfile b/Dockerfile index ed158fe03c..a18345597d 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.21.6b1 AS build ARG DAPPER_HOST_ARCH ENV ARCH $DAPPER_HOST_ARCH RUN set -x && \