From 930ade22c9b2eaa18efb53f11e23d4d31f2f91f3 Mon Sep 17 00:00:00 2001
From: Rafael <32229014+rafaelbreno@users.noreply.github.com>
Date: Thu, 12 Sep 2024 16:22:10 -0300
Subject: [PATCH] [v1.30] September K8s patch (#6811)

* update k8s version

* update build-base version
---
 Dockerfile         | 4 ++--
 scripts/version.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 114c98536a..998df9a743 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 ARG KUBERNETES_VERSION=dev
 
 # Build environment
-FROM rancher/hardened-build-base:v1.22.5b1 AS build
+FROM rancher/hardened-build-base:v1.22.6b1 AS build
 ARG DAPPER_HOST_ARCH
 ENV ARCH $DAPPER_HOST_ARCH
 RUN set -x && \
@@ -117,7 +117,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.30.4-rke2r1-build20240910 AS kubernetes
+FROM rancher/hardened-kubernetes:v1.30.5-rke2r1-build20240912 AS kubernetes
 FROM rancher/hardened-containerd:v1.7.21-k3s2-build20240910 AS containerd
 FROM rancher/hardened-crictl:v1.30.1-build20240910 AS crictl
 FROM rancher/hardened-runc:v1.1.14-build20240910 AS runc
diff --git a/scripts/version.sh b/scripts/version.sh
index f03db9b0e4..4f2660b2e0 100755
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -32,8 +32,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.30.4}
-KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.30.4-rke2r1-build20240815}
+KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.30.5}
+KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.30.5-rke2r1-build20240912}
 ETCD_VERSION=${ETCD_VERSION:-v3.5.13-k3s1}
 PAUSE_VERSION=${PAUSE_VERSION:-3.6}
 CCM_VERSION=${CCM_VERSION:-v1.30.4-build20240910}