From ace2a1464aa93304286708f960dd126d4f6f4ca2 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Wed, 16 Oct 2024 17:54:35 +0000 Subject: [PATCH] Bump K3s version for release-1.28 Updates k3s: https://github.com/k3s-io/k3s/compare/571f20aa661a...63bfb1936862dfae96eeb6b609f80ada6c8e87c4 Signed-off-by: Brad Davidson --- go.mod | 2 +- go.sum | 4 ++-- scripts/build-images | 2 +- scripts/version.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 7325e56ba2..4cd3455008 100644 --- a/go.mod +++ b/go.mod @@ -95,7 +95,7 @@ require ( github.com/google/go-containerregistry v0.20.2 github.com/iamacarpet/go-win64api v0.0.0-20210311141720-fe38760bed28 github.com/k3s-io/helm-controller v0.15.15 - github.com/k3s-io/k3s v1.28.15-0.20241012053957-571f20aa661a // release-1.28 + github.com/k3s-io/k3s v1.28.15-0.20241016053552-63bfb1936862 // release-1.28 github.com/k3s-io/kine v0.13.2 github.com/libp2p/go-netroute v0.2.1 github.com/natefinch/lumberjack v2.0.0+incompatible diff --git a/go.sum b/go.sum index 6927ab824a..cc3b8854ff 100644 --- a/go.sum +++ b/go.sum @@ -1235,8 +1235,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.15.15 h1:Ot7IWTyl0+gowYG9ZxOq8esyxqoOmKUPMRPvD3TUTas= github.com/k3s-io/helm-controller v0.15.15/go.mod h1:xGN8KNHGkmlaCwyjNx281cR8IEqC9MJgyMaS3wn1k+o= -github.com/k3s-io/k3s v1.28.15-0.20241012053957-571f20aa661a h1:okyAqc3tYOfGT6PGt4BRKBDx6jdjscPHoto7900yd4Y= -github.com/k3s-io/k3s v1.28.15-0.20241012053957-571f20aa661a/go.mod h1:NK/PNDoGD6LcAospuoy4ij8t+w9iPBP2+hBa70zAsec= +github.com/k3s-io/k3s v1.28.15-0.20241016053552-63bfb1936862 h1:d0EqC1ge7KDdwczNLshzAPpRagQWcUs0z9yqQeYApH0= +github.com/k3s-io/k3s v1.28.15-0.20241016053552-63bfb1936862/go.mod h1:NK/PNDoGD6LcAospuoy4ij8t+w9iPBP2+hBa70zAsec= 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 index 27cc6e35e1..7e855aae90 100755 --- 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 index 6676708b41..379ad363ed 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -36,7 +36,7 @@ KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.28.14} KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.28.14-rke2r1-build20240912} ETCD_VERSION=${ETCD_VERSION:-v3.5.13-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} -CCM_VERSION=${CCM_VERSION:-v1.28.15-0.20241012053957-571f20aa661a-build20241014} +CCM_VERSION=${CCM_VERSION:-v1.28.15-0.20241016053552-63bfb1936862-build20241016} if [ -d .git ]; then if [ -z "$GIT_TAG" ]; then