From 6d0c5ae3cc279eb8b93a0ea647b9979f9a2d1881 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Wed, 17 Jan 2024 14:55:30 -0700 Subject: [PATCH 1/3] update to 1.26.13 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 a706a4df7c..a4bf1ee51c 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.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 8d54527268..64a125db1c 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 \ @@ -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-build20231220 AS kubernetes +FROM rancher/hardened-kubernetes:v1.26.13-rke2r1-build20240117 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 f3b87a0b54..3058eb9412 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.12} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.26.12-rke2r1-build20231220} +KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.26.13} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.26.13-rke2r1-build20240117} ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} CCM_VERSION=${CCM_VERSION:-v1.26.3-build20230406} From 8e97ac70c87c4208a998524f75456611e52a2c35 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Wed, 17 Jan 2024 15:03:12 -0700 Subject: [PATCH 2/3] update go version 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 a4bf1ee51c..0a07c60dc6 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.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 64a125db1c..9e3729ee3b 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 023043519e9ebed4e8a04f66c8ae298a7660d6f4 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Wed, 17 Jan 2024 15:28:15 -0700 Subject: [PATCH 3/3] update go version 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 0a07c60dc6..c96588248b 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.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 9e3729ee3b..bcfa573e24 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 \