Bump K3s version for release-1.32

Updates k3s: k3s-io/k3s@124be74...68fbd1a Signed-off-by: Brad Davidson <[email protected]>
rancher · Dec 21, 2024 · 4ea4b4b · 4ea4b4b
1 parent 86d0f64
commit 4ea4b4b
Show file tree

Hide file tree

Showing 10 changed files with 244 additions and 238 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -56,7 +56,7 @@ jobs:
       # in the Dockerfile to include the new trivy version that supports VEX
       run: |
         docker run --rm -v "$(pwd)/build:/build" -v "$(pwd):/workspace" \
-          -w /workspace rancher/hardened-build-base:v1.22.8b2 \
+          -w /workspace rancher/hardened-build-base:v1.23.3b1 \
           make scan-images
     - name: Upload Scan Results
       uses: actions/upload-artifact@v4

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 ARG KUBERNETES_VERSION=dev
 
 # Build environment
-FROM rancher/hardened-build-base:v1.22.9b1 AS build
+FROM rancher/hardened-build-base:v1.23.3b1 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.31.4-rke2r1-build20241212 AS kubernetes
+FROM rancher/hardened-kubernetes:v1.32.0-rke2r1-build20241212 AS kubernetes
 FROM rancher/hardened-containerd:v1.7.23-k3s2-build20241203 AS containerd
 FROM rancher/hardened-crictl:v1.31.1-build20241011 AS crictl
 FROM rancher/hardened-runc:v1.1.14-build20240910 AS runc

diff --git a/Dockerfile.windows b/Dockerfile.windows
@@ -5,7 +5,7 @@ RUN apk --no-cache add \
     unzip
 
 # Dapper/Drone/CI environment
-FROM rancher/hardened-build-base:v1.21.5b2 AS dapper
+FROM rancher/hardened-build-base:v1.23.3b1 AS dapper
 ENV DAPPER_ENV GODEBUG REPO TAG GITHUB_ACTION_TAG PAT_USERNAME PAT_TOKEN KUBERNETES_VERSION DOCKER_BUILDKIT DRONE_BUILD_EVENT IMAGE_NAME AWS_SECRET_ACCESS_KEY AWS_ACCESS_KEY_ID ENABLE_REGISTRY
 ARG DAPPER_HOST_ARCH
 ENV ARCH $DAPPER_HOST_ARCH

diff --git a/channels.yaml b/channels.yaml
@@ -48,6 +48,9 @@ channels:
 - name: v1.31
   latestRegexp: v1\.31\..*
   excludeRegexp: ^[^+]+-
+- name: v1.32
+  latestRegexp: v1\.32\..*
+  excludeRegexp: ^[^+]+-
 github:
   owner: rancher
   repo: rke2

diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml
@@ -32,10 +32,10 @@ charts:
   - version: v0.26.101
     filename: /charts/rke2-flannel.yaml
     bootstrap: true
-  - version: 1.9.100
+  - version: 1.10.000
     filename: /charts/rancher-vsphere-cpi.yaml
     bootstrap: true
-  - version: 3.3.1-rancher700
+  - version: 3.3.1-rancher800
     filename: /charts/rancher-vsphere-csi.yaml
     bootstrap: true
   - version: 0.2.600

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/pkg/rke2/clusterrole.go b/pkg/rke2/clusterrole.go
@@ -34,14 +34,11 @@ func setClusterRoles() cmds.StartupHook {
 				logrus.Fatalf("clusterrole: new k8s client: %v", err)
 			}
 
-			stopChan := make(chan struct{})
-			defer close(stopChan)
-
 			// kube-apiserver has a post-start hook that reconciles the built-in cluster RBAC on every startup.
 			// We're reusing that here to bootstrap our own roles and bindings.
 			hookContext := genericapiserver.PostStartHookContext{
 				LoopbackClientConfig: config,
-				StopCh:               stopChan,
+				Context:              ctx,
 			}
 
 			policy := rbacrest.PolicyData{

diff --git a/scripts/build-images b/scripts/build-images
@@ -68,7 +68,7 @@ EOF
 
 if [ "${GOARCH}" != "arm64" ]; then
 xargs -n1 -t docker image pull --quiet << EOF > build/images-vsphere.txt
-    ${REGISTRY}/rancher/mirrored-cloud-provider-vsphere:v1.31.0
+    ${REGISTRY}/rancher/mirrored-cloud-provider-vsphere:v1.32.1
     ${REGISTRY}/rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.1
     ${REGISTRY}/rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.1
     ${REGISTRY}/rancher/mirrored-sig-storage-csi-node-driver-registrar:v2.12.0

diff --git a/scripts/version.sh b/scripts/version.sh
@@ -32,11 +32,11 @@ 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.31.4}
-KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.31.4-rke2r1-build20241212}
+KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.32.0}
+KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.32.0-rke2r1-build20241212}
 ETCD_VERSION=${ETCD_VERSION:-v3.5.16-k3s1}
 PAUSE_VERSION=${PAUSE_VERSION:-3.6}
-CCM_VERSION=${CCM_VERSION:-v1.31.2-0.20241016053446-0955fa330f90-build20241016}
+CCM_VERSION=${CCM_VERSION:-v1.32.0-rc1.0.20241220224140-68fbd1a6b543-build20241221}
 
 if [ -d .git ]; then
     if [ -z "$GIT_TAG" ]; then