Bump K3s version for release-1.31

Updates k3s: k3s-io/k3s@d74ad42...0955fa3 Signed-off-by: Brad Davidson <[email protected]>
rancher · Oct 16, 2024 · 6a08576 · 6a08576
1 parent 90c0f27
commit 6a08576
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -78,7 +78,7 @@ require (
 	github.com/google/go-containerregistry v0.20.2
 	github.com/iamacarpet/go-win64api v0.0.0-20240507095429-873e84e85847
 	github.com/k3s-io/helm-controller v0.16.5
-	github.com/k3s-io/k3s v1.31.2-0.20241012053821-d74ad4253a54 // release-1.31
+	github.com/k3s-io/k3s v1.31.2-0.20241016053446-0955fa330f90 // release-1.31
 	github.com/k3s-io/kine v0.13.2
 	github.com/libp2p/go-netroute v0.2.1
 	github.com/natefinch/lumberjack v2.0.0+incompatible // indirect

diff --git a/go.sum b/go.sum
@@ -1105,8 +1105,8 @@ github.com/k3s-io/etcd/server/v3 v3.5.13-k3s1 h1:Pqcxkg7V60c26ZpHoekP9QoUdLuduxF
 github.com/k3s-io/etcd/server/v3 v3.5.13-k3s1/go.mod h1:K/8nbsGupHqmr5MkgaZpLlH1QdX1pcNQLAkODy44XcQ=
 github.com/k3s-io/helm-controller v0.16.5 h1:SsUHfksQXNwePkswv4a970EGD2h0Exsf6t3IdXhpXRo=
 github.com/k3s-io/helm-controller v0.16.5/go.mod h1:AcSxEhOIUgeVvBTnJOAwcezBZXtYew/RhKwO5xp3RlM=
-github.com/k3s-io/k3s v1.31.2-0.20241012053821-d74ad4253a54 h1:e2C12NHGk3611S1Uc5hPR1oa1zjwGiHZUW8lvBi9kkg=
-github.com/k3s-io/k3s v1.31.2-0.20241012053821-d74ad4253a54/go.mod h1:SCNR9LeHnQ4H3XQLAeeSFfyoxpzHHhxIEy5SAjje7NM=
+github.com/k3s-io/k3s v1.31.2-0.20241016053446-0955fa330f90 h1:ylm/eOXQF43s2MCTZL8qJ/i3GYM6C7XnEuCa08fRDmk=
+github.com/k3s-io/k3s v1.31.2-0.20241016053446-0955fa330f90/go.mod h1:SCNR9LeHnQ4H3XQLAeeSFfyoxpzHHhxIEy5SAjje7NM=
 github.com/k3s-io/kine v0.13.2 h1:l++g2KY/3UaPJiGpgYuGoqaaYKeMpVj9fP/yfnSxHxo=
 github.com/k3s-io/kine v0.13.2/go.mod h1:Zi9F142tmeXVqhPjL6KHVnwOBs8wc/V5r3avKSpIHn0=
 github.com/k3s-io/klog v1.0.0-k3s2/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=

diff --git a/scripts/build-images b/scripts/build-images
@@ -20,7 +20,7 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt
     ${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.7.1-build20240910
     ${REGISTRY}/rancher/hardened-addon-resizer:1.8.20-build20240910
     ${REGISTRY}/rancher/klipper-helm:v0.9.3-build20241008
-    ${REGISTRY}/rancher/mirrored-library-busybox:1.36.1
+    ${REGISTRY}/rancher/klipper-lb:v0.4.9
     ${REGISTRY}/rancher/mirrored-pause:${PAUSE_VERSION}
     ${REGISTRY}/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.4.4
     ${REGISTRY}/rancher/nginx-ingress-controller:v1.10.5-hardened1

diff --git a/scripts/version.sh b/scripts/version.sh
@@ -36,7 +36,7 @@ KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.31.1}
 KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.31.1-rke2r1-build20240912}
 ETCD_VERSION=${ETCD_VERSION:-v3.5.13-k3s1}
 PAUSE_VERSION=${PAUSE_VERSION:-3.6}
-CCM_VERSION=${CCM_VERSION:-v1.31.2-0.20241012053821-d74ad4253a54-build20241014}
+CCM_VERSION=${CCM_VERSION:-v1.31.2-0.20241016053446-0955fa330f90-build20241016}
 
 if [ -d .git ]; then
     if [ -z "$GIT_TAG" ]; then