Bump k3s for v1.29

pkg/bootstrap/bootstrap.go

@@ -107,10 +107,12 @@ func Stage(resolver *images.Resolver, nodeConfig *daemonconfig.Node, cfg cmds.Ag
 		// If we didn't find the requested image in a tarball, pull it from the remote registry.
 		// Note that this will fail (potentially after a long delay) if the registry cannot be reached.
 		if img == nil {
-			registry, err := registries.GetPrivateRegistries(nodeConfig.AgentConfig.PrivateRegistry)
+			registry, err := registries.GetPrivateRegistries(cfg.PrivateRegistry)
 			if err != nil {
-				return "", errors.Wrapf(err, "failed to load private registry configuration from %s", nodeConfig.AgentConfig.PrivateRegistry)
+				return "", errors.Wrapf(err, "failed to load private registry configuration from %s", cfg.PrivateRegistry)
 			}
+			// Override registry config with version provided by (and potentially modified by) k3s agent setup
+			registry.Registry = nodeConfig.AgentConfig.Registry
 
 			// Try to enable Kubelet image credential provider plugins; fall back to legacy docker credentials
 			if agent.ImageCredProvAvailable(&nodeConfig.AgentConfig) {
@@ -124,6 +126,8 @@ func Stage(resolver *images.Resolver, nodeConfig *daemonconfig.Node, cfg cmds.Ag
 			}
 
 			logrus.Infof("Pulling runtime image %s", ref.Name())
+			// Make sure that the runtime image is also loaded into containerd
+			images.Pull(imagesDir, images.Runtime, ref)
 			img, err = registry.Image(ref, remote.WithPlatform(v1.Platform{Architecture: runtime.GOARCH, OS: runtime.GOOS}))
 			if err != nil {
 				return "", errors.Wrapf(err, "failed to get runtime image %s", ref.Name())

pkg/cli/cmds/agent.go

@@ -30,6 +30,7 @@ var (
 		"image-credential-provider-config":  copyFlag,
 		"docker":                            dropFlag,
 		"container-runtime-endpoint":        copyFlag,
+		"disable-default-registry-endpoint": copyFlag,
 		"image-service-endpoint":            dropFlag,
 		"pause-image":                       dropFlag,
 		"default-runtime":                   copyFlag,

pkg/cli/cmds/server.go

@@ -102,6 +102,8 @@ var (
 		"image-credential-provider-config":  copyFlag,
 		"docker":                            dropFlag,
 		"container-runtime-endpoint":        copyFlag,
+		"disable-default-registry-endpoint": copyFlag,
+		"embedded-registry":                 copyFlag,
 		"image-service-endpoint":            dropFlag,
 		"pause-image":                       dropFlag,
 		"default-runtime":                   copyFlag,

scripts/build-binary

@@ -23,6 +23,7 @@ VERSION_FLAGS="
     -X ${K3S_PKG}/pkg/version.GitCommit=${REVISION}
     -X ${K3S_PKG}/pkg/version.Program=${PROG}
     -X ${K3S_PKG}/pkg/version.Version=${VERSION}
+    -X ${K3S_PKG}/pkg/version.UpstreamGolang=${VERSION_GOLANG}
     -X ${RKE2_PKG}/pkg/images.DefaultRegistry=${REGISTRY}
     -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20230802
     -X ${RKE2_PKG}/pkg/images.DefaultKubernetesImage=rancher/hardened-kubernetes:${KUBERNETES_IMAGE_TAG}

scripts/build-images

@@ -19,7 +19,7 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt
     ${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20230802
     ${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.6.3-build20231009
     ${REGISTRY}/rancher/klipper-helm:v0.8.2-build20230815
-    ${REGISTRY}/rancher/klipper-lb:v0.4.4
+    ${REGISTRY}/rancher/klipper-lb:v0.4.5
     ${REGISTRY}/rancher/mirrored-pause:${PAUSE_VERSION}
     ${REGISTRY}/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v20230312-helm-chart-4.5.2-28-g66a760794
     ${REGISTRY}/rancher/nginx-ingress-controller:nginx-1.9.3-hardened1

scripts/build-windows-binary

@@ -29,6 +29,7 @@ VERSION_FLAGS="
     -X ${K3S_PKG}/pkg/version.GitCommit=${REVISION}
     -X ${K3S_PKG}/pkg/version.Program=${PROG}
     -X ${K3S_PKG}/pkg/version.Version=${VERSION}
+    -X ${K3S_PKG}/pkg/version.UpstreamGolang=${VERSION_GOLANG}
     -X ${RKE2_PKG}/pkg/images.DefaultRegistry=${REGISTRY}
     -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20230802
     -X ${RKE2_PKG}/pkg/images.DefaultKubernetesImage=${REPO}/hardened-kubernetes:${KUBERNETES_IMAGE_TAG}

scripts/version.sh

@@ -67,4 +67,7 @@ if [[ "${VERSION}" =~ ^v([0-9]+)\.([0-9]+)\.([0-9]+)([-+][a-zA-Z0-9.]+)?[-+]((rk
     echo "VERSION=${VERSION} parsed as MAJOR=${MAJOR} MINOR=${MINOR} PATCH=${PATCH} RC=${RC} RKE2_PATCH=${RKE2_PATCH}"
 fi
 
+DEPENDENCIES_URL="https://raw.githubusercontent.com/kubernetes/kubernetes/${KUBERNETES_VERSION}/build/dependencies.yaml"
+VERSION_GOLANG="go"$(curl -sL "${DEPENDENCIES_URL}" | yq e '.dependencies[] | select(.name == "golang: upstream version").version' -)
+
 DOCKERIZED_VERSION="${VERSION/+/-}" # this mimics what kubernetes builds do