[release-1.26] update rke2 (#4368)

Dockerfile

@@ -1,7 +1,7 @@
 ARG KUBERNETES_VERSION=dev
 
 # Build environment
-FROM rancher/hardened-build-base:v1.19.9b2 AS build
+FROM rancher/hardened-build-base:v1.19.10b2 AS build
 ARG DAPPER_HOST_ARCH
 ENV ARCH $DAPPER_HOST_ARCH
 RUN set -x \
@@ -48,7 +48,7 @@ RUN curl -sL https://storage.googleapis.com/kubernetes-release/release/$( \
     pip install codespell
 
 RUN python3 -m pip install awscli
-RUN curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.52.2
+RUN curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.50.1
 RUN set -x \
     && apk --no-cache add \
     libarchive-tools \
@@ -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.5-rke2r1-build20230518 AS kubernetes
+FROM rancher/hardened-kubernetes:v1.26.6-rke2r1-build20230614 AS kubernetes
 FROM rancher/hardened-containerd:v1.7.1-k3s1-build20230511 AS containerd
 FROM rancher/hardened-crictl:v1.26.1-build20230406 AS crictl
 FROM rancher/hardened-runc:v1.1.7-build20230511 AS runc

scripts/test-helpers

@@ -380,9 +380,9 @@ export -f gen-certs
 
 inc-count() {(
     shopt -s extglob
-    local count=$(exec 2>/dev/null; ls -1d $TEST_DIR/$1/+([0-9]) | xargs -n1 basename | sort -n -r | head -1)
+    local count=$(exec 2>/dev/null; ls -1d "$TEST_DIR/$1/+([0-9])" | xargs -n1 basename | sort -n -r | head -1)
     count=$((count+1))
-    mkdir -p $TEST_DIR/$1/$count/metadata
+    mkdir -p "$TEST_DIR/$1/$count/metadata"
     echo $count
 )}
 export -f inc-count

scripts/validate

@@ -47,9 +47,6 @@ echo Running validation
 echo Running: golangci-lint
 golangci-lint run -v
 
-echo Running: go fmt
-go fmt ./
-
 echo Running: go mod tidy
 go mod tidy
 

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.5}
-KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.26.5-rke2r1-build20230518}
+KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.26.6}
+KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.26.6-rke2r1-build20230614}
 ETCD_VERSION=${ETCD_VERSION:-v3.5.7-k3s1}
 PAUSE_VERSION=${PAUSE_VERSION:-3.6}
 CCM_VERSION=${CCM_VERSION:-v1.26.3-build20230406}