From ab570cdfe18728ce1492c8d75103c802a6965c35 Mon Sep 17 00:00:00 2001 From: Brooks Newberry Date: Wed, 18 Oct 2023 21:02:15 -0700 Subject: [PATCH 1/4] remove windows binaries from release Signed-off-by: Brooks Newberry --- scripts/package-windows-binary | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/package-windows-binary b/scripts/package-windows-binary index e5ff27dfb8..7b7021e335 100755 --- a/scripts/package-windows-binary +++ b/scripts/package-windows-binary @@ -9,6 +9,6 @@ if [ "${GOARCH}" == "s390x" ]; then exit 0 fi -mkdir -p dist/artifacts +mkdir -p dist/win_artifacts -install -s bin/${PROG}.exe dist/artifacts/${PROG}-windows-amd64.exe +install -s bin/${PROG}.exe dist/win_artifacts/${PROG}-windows-amd64.exe From 40f2f6599152510915bc40f2ce7f6b081a80693a Mon Sep 17 00:00:00 2001 From: Brooks Newberry Date: Wed, 18 Oct 2023 21:03:04 -0700 Subject: [PATCH 2/4] update Go Signed-off-by: Brooks Newberry --- .drone.yml | 4 ++-- Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index b778e904cd..bb69362341 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.8b2 + image: rancher/hardened-build-base:v1.20.10b1 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - DRONE_TAG=${DRONE_TAG} make publish-image-runtime @@ -223,7 +223,7 @@ steps: - drone-publish.rancher.io - name: publish-image-runtime - image: rancher/hardened-build-base:v1.20.8b2 + image: rancher/hardened-build-base:v1.20.10b1 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - DRONE_TAG=${DRONE_TAG} make publish-image-runtime diff --git a/Dockerfile b/Dockerfile index d9379a7100..3460f27a24 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG KUBERNETES_VERSION=dev # Build environment -FROM rancher/hardened-build-base:v1.20.8b2 AS build +FROM rancher/hardened-build-base:v1.20.10b1 AS build ARG DAPPER_HOST_ARCH ENV ARCH $DAPPER_HOST_ARCH RUN set -x \ From 1f15e099f977dda6db5156e346b6134913fb14bf Mon Sep 17 00:00:00 2001 From: Brooks Newberry Date: Wed, 18 Oct 2023 21:04:04 -0700 Subject: [PATCH 3/4] update Kubernetes Signed-off-by: Brooks Newberry --- Dockerfile | 2 +- scripts/version.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3460f27a24..049d34c4b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -138,7 +138,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.26.9-rke2r1-build20230913 AS kubernetes +FROM rancher/hardened-kubernetes:v1.26.10-rke2r1-build20231018 AS kubernetes FROM rancher/hardened-containerd:v1.7.7-k3s1-build20231010 AS containerd FROM rancher/hardened-crictl:v1.26.1-build20230406 AS crictl FROM rancher/hardened-runc:v1.1.8-build20230802 AS runc diff --git a/scripts/version.sh b/scripts/version.sh index 33ec0b0ebc..11068628b0 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.9} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.26.9-rke2r1-build20230913} +KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.26.10} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.26.10-rke2r1-build20231018} ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} CCM_VERSION=${CCM_VERSION:-v1.26.3-build20230406} From 1789907f9deec12b8e825b446cc547942f5119cd Mon Sep 17 00:00:00 2001 From: Brooks Newberry Date: Thu, 19 Oct 2023 07:24:44 -0700 Subject: [PATCH 4/4] Revert "remove windows binaries from release" This reverts commit ab570cdfe18728ce1492c8d75103c802a6965c35. --- scripts/package-windows-binary | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/package-windows-binary b/scripts/package-windows-binary index 7b7021e335..e5ff27dfb8 100755 --- a/scripts/package-windows-binary +++ b/scripts/package-windows-binary @@ -9,6 +9,6 @@ if [ "${GOARCH}" == "s390x" ]; then exit 0 fi -mkdir -p dist/win_artifacts +mkdir -p dist/artifacts -install -s bin/${PROG}.exe dist/win_artifacts/${PROG}-windows-amd64.exe +install -s bin/${PROG}.exe dist/artifacts/${PROG}-windows-amd64.exe