From 42cab2f61939504cb17073e47deaea0b29fe2c1b Mon Sep 17 00:00:00 2001
From: Brian Downs <brian.downs@gmail.com>
Date: Fri, 15 Mar 2024 15:04:26 -0700
Subject: [PATCH] update k8s to 1.28.8 and Go (#5623)

---
 .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 776afdc0a0..5e3a48521f 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:v1.21.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 d2eba3d1ec..91082f76d6 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 && \
@@ -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.28.7-rke2r2-build20240304 AS kubernetes
+FROM rancher/hardened-kubernetes:v1.28.8-rke2r1-build20240315 AS kubernetes
 FROM rancher/hardened-containerd:v1.7.11-k3s2-build20231211 AS containerd
 FROM rancher/hardened-crictl:v1.26.1-build20231010 AS crictl
 FROM rancher/hardened-runc:v1.1.12-build20240201 AS runc
diff --git a/scripts/version.sh b/scripts/version.sh
index e58f033257..17e8909428 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.7}
-KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.28.7-rke2r2-build20240304}
+KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.28.8}
+KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.28.8-rke2r1-build20240315}
 ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1}
 PAUSE_VERSION=${PAUSE_VERSION:-3.6}
 CCM_VERSION=${CCM_VERSION:-v1.28.2-build20231016}