From a413a7fe6321b73971e66b6b8eb87900a40de559 Mon Sep 17 00:00:00 2001
From: Brian Downs <brian.downs@gmail.com>
Date: Thu, 14 Mar 2024 15:14:34 -0700
Subject: [PATCH] update to 1.26.15 (#5616)

---
 .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 ae4bfa971b..1b7d99a65d 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.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 44697ec646..3b403189d4 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 \
@@ -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.14-rke2r1-build20240214 AS kubernetes
+FROM rancher/hardened-kubernetes:v1.26.15-rke2r1-build20240314 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.12-build20240201 AS runc
diff --git a/scripts/version.sh b/scripts/version.sh
index 7a076656f7..9c5a924069 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.14}
-KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.26.14-rke2r1-build20240214}
+KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.26.15}
+KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.26.15-rke2r1-build20240314}
 ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1}
 PAUSE_VERSION=${PAUSE_VERSION:-3.6}
 CCM_VERSION=${CCM_VERSION:-v1.26.3-build20230406}