fix: ignore image digest when doing upgrade-k8s

smira · smira · commit dcf23be4f13e · 2026-03-06T19:17:40.000+04:00
The `talosctl upgrade-k8s` doesn't support pinning to image digests, but it should ignore any image digests if they already exist in the machine configuration. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com> (cherry picked from commit 0ab84c2)
diff --git a/pkg/cluster/kubernetes/detect.go b/pkg/cluster/kubernetes/detect.go
@@ -48,12 +48,14 @@ func DetectLowestVersion(ctx context.Context, cluster UpgradeProvider, options U
 				continue
 			}
 
-			idx := strings.LastIndex(container.Image, ":")
-			if idx == -1 {
+			image, _, _ := strings.Cut(container.Image, "@")
+
+			_, imageTag, ok := strings.Cut(image, ":")
+			if !ok {
 				continue
 			}
 
-			v, err := semver.ParseTolerant(strings.TrimLeft(container.Image[idx+1:], "v"))
+			v, err := semver.ParseTolerant(strings.TrimLeft(imageTag, "v"))
 			if err != nil {
 				options.Log("failed to parse %s container version %s", app, err)
 
diff --git a/pkg/cluster/kubernetes/kubelet.go b/pkg/cluster/kubernetes/kubelet.go
@@ -191,6 +191,8 @@ func upgradeKubeletPatcher(
 		}
 
 		oldImage := kubeletSpec.TypedSpec().Image
+		oldImage, _, _ = strings.Cut(oldImage, "@") // ignore digest if present
+
 		oldSuffix := extractKubeletVersionSuffix(oldImage)
 		newVersion := options.Path.ToVersion() + oldSuffix
 
diff --git a/pkg/cluster/kubernetes/talos_managed.go b/pkg/cluster/kubernetes/talos_managed.go
@@ -390,6 +390,7 @@ func upgradeStaticPodPatcher(options UpgradeOptions, service string, configResou
 		}
 
 		logUpdate := func(oldImage string) {
+			oldImage, _, _ = strings.Cut(oldImage, "@") // ignore digest if present
 			_, version, _ := strings.Cut(oldImage, ":")
 
 			if version == "" {

Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,8 @@ func upgradeKubeletPatcher(`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`oldImage := kubeletSpec.TypedSpec().Image`
	`194`	`+ oldImage, _, _ = strings.Cut(oldImage, "@") // ignore digest if present`
	`195`	`+`
`194`	`196`	`oldSuffix := extractKubeletVersionSuffix(oldImage)`
`195`	`197`	`newVersion := options.Path.ToVersion() + oldSuffix`
`196`	`198`
Original file line number	Diff line number	Diff line change
`@@ -390,6 +390,7 @@ func upgradeStaticPodPatcher(options UpgradeOptions, service string, configResou`
`390`	`390`	`}`
`391`	`391`
`392`	`392`	`logUpdate := func(oldImage string) {`
	`393`	`+ oldImage, _, _ = strings.Cut(oldImage, "@") // ignore digest if present`
`393`	`394`	`_, version, _ := strings.Cut(oldImage, ":")`
`394`	`395`
`395`	`396`	`if version == "" {`