Bump K3s version for v1.28 with spegel support

Signed-off-by: Brad Davidson <[email protected]>
rancher · Dec 9, 2023 · 7541c8a · 7541c8a
1 parent d39670a
commit 7541c8a
Show file tree

Hide file tree

Showing 7 changed files with 602 additions and 215 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -114,9 +114,9 @@ RUN rm -vf /charts/*.sh /charts/*.md /charts/chart_versions.yaml
 # 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.28.4-rke2r1-build20231115 AS kubernetes
-FROM rancher/hardened-containerd:v1.7.7-k3s1-build20231010 AS containerd
+FROM rancher/hardened-containerd:v1.7.10-k3s1-build20231208 AS containerd
 FROM rancher/hardened-crictl:v1.26.1-build20231010 AS crictl
-FROM rancher/hardened-runc:v1.1.8-build20231009 AS runc
+FROM rancher/hardened-runc:v1.1.10-build20231208 AS runc
 
 FROM scratch AS runtime-collect
 COPY --from=runc \

diff --git a/Dockerfile.windows b/Dockerfile.windows
@@ -38,7 +38,7 @@ RUN curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/ins
 WORKDIR /source
 # End Dapper stuff
 
-FROM rancher/hardened-containerd:v1.7.7-k3s1-build20231010-amd64-windows AS containerd
+FROM rancher/hardened-containerd:v1.7.10-k3s1-build20231208-amd64-windows AS containerd
 FROM build as windows-runtime-collect
 ARG KUBERNETES_VERSION=dev
 

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/pkg/bootstrap/bootstrap.go b/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) {

diff --git a/pkg/cli/cmds/agent.go b/pkg/cli/cmds/agent.go
@@ -30,6 +30,8 @@ var (
 		"image-credential-provider-config":  copyFlag,
 		"docker":                            dropFlag,
 		"container-runtime-endpoint":        copyFlag,
+		"disable-default-registry-endpoint": copyFlag,
+		"default-runtime":                   hideFlag,
 		"image-service-endpoint":            dropFlag,
 		"pause-image":                       dropFlag,
 		"disable-apiserver-lb":              dropFlag,

diff --git a/pkg/cli/cmds/server.go b/pkg/cli/cmds/server.go
@@ -102,6 +102,9 @@ var (
 		"image-credential-provider-config":  copyFlag,
 		"docker":                            dropFlag,
 		"container-runtime-endpoint":        copyFlag,
+		"disable-default-registry-endpoint": copyFlag,
+		"default-runtime":                   hideFlag,
+		"embedded-registry":                 copyFlag,
 		"image-service-endpoint":            dropFlag,
 		"pause-image":                       dropFlag,
 		"private-registry":                  copyFlag,