fix: print talosctl images to release notes

shanduur · smira · commit 9f8d938db68f · 2026-01-21T16:19:15.000+04:00
After changing `talsoctl images k8s-bundle and talos-bundle` we stopped printing some of the images to release notes. This fixes that issue. Signed-off-by: Mateusz Urbanek <mateusz.urbanek@siderolabs.com> (cherry picked from commit 7416dca)
diff --git a/cmd/talosctl/cmd/talos/image.go b/cmd/talosctl/cmd/talos/image.go
@@ -173,20 +173,13 @@ var imageDefaultCmd = &cobra.Command{
 	},
 }
 
-const (
-	provisionerDocker    = "docker"
-	provisionerInstaller = "installer"
-	provisionerAll       = "all"
-)
-
-var imageDefaultCmdFlags = struct {
-	provisioner pflag.Value
-}{
-	provisioner: helpers.StringChoice(provisionerInstaller, provisionerDocker, provisionerAll),
-}
+var imageTalosBundleCmdFlags = struct {
+	extensions bool
+	overlays   bool
+}{}
 
-// imageSourceBundleCmd represents the image talos-bundle command.
-var imageSourceBundleCmd = &cobra.Command{
+// imageTalosBundleCmd represents the image talos-bundle command.
+var imageTalosBundleCmd = &cobra.Command{
 	Use:   "talos-bundle [talos-version]",
 	Short: "List the default system images and extensions used for Talos",
 	Long:  ``,
@@ -246,16 +239,6 @@ var imageSourceBundleCmd = &cobra.Command{
 
 		sources := images.ListSourcesFor(tag)
 
-		extensions, err = artifacts.FetchOfficialExtensions(tag)
-		if err != nil {
-			return fmt.Errorf("error fetching official extensions for %s: %w", tag, err)
-		}
-
-		overlays, err = artifacts.FetchOfficialOverlays(tag)
-		if err != nil {
-			return fmt.Errorf("error fetching official overlays for %s: %w", tag, err)
-		}
-
 		fmt.Printf("%s\n", sources.Installer)
 		fmt.Printf("%s\n", sources.InstallerBase)
 		fmt.Printf("%s\n", sources.Imager)
@@ -266,12 +249,26 @@ var imageSourceBundleCmd = &cobra.Command{
 
 		digestedReferences := []string{}
 
-		for _, overlay := range overlays {
-			digestedReferences = append(digestedReferences, fmt.Sprintf("%s@%s", overlay.TaggedReference.String(), overlay.Digest))
+		if imageTalosBundleCmdFlags.extensions {
+			extensions, err = artifacts.FetchOfficialExtensions(tag)
+			if err != nil {
+				return fmt.Errorf("error fetching official extensions for %s: %w", tag, err)
+			}
+
+			for _, extension := range extensions {
+				digestedReferences = append(digestedReferences, fmt.Sprintf("%s@%s", extension.TaggedReference.String(), extension.Digest))
+			}
 		}
 
-		for _, extension := range extensions {
-			digestedReferences = append(digestedReferences, fmt.Sprintf("%s@%s", extension.TaggedReference.String(), extension.Digest))
+		if imageTalosBundleCmdFlags.overlays {
+			overlays, err = artifacts.FetchOfficialOverlays(tag)
+			if err != nil {
+				return fmt.Errorf("error fetching official overlays for %s: %w", tag, err)
+			}
+
+			for _, overlay := range overlays {
+				digestedReferences = append(digestedReferences, fmt.Sprintf("%s@%s", overlay.TaggedReference.String(), overlay.Digest))
+			}
 		}
 
 		slices.Sort(digestedReferences)
@@ -647,12 +644,14 @@ func init() {
 	imageCmd.PersistentFlags().StringVar(&imageCmdFlags.namespace, "namespace", "cri", "namespace to use: `system` (etcd and kubelet images) or `cri` for all Kubernetes workloads")
 	addCommand(imageCmd)
 
-	imageCmd.AddCommand(imageDefaultCmd)
-	imageDefaultCmd.PersistentFlags().Var(imageDefaultCmdFlags.provisioner, "provisioner", "include provisioner specific images")
-
 	imageCmd.AddCommand(imageListCmd)
 	imageCmd.AddCommand(imagePullCmd)
-	imageCmd.AddCommand(imageSourceBundleCmd)
+
+	imageCmd.AddCommand(imageTalosBundleCmd)
+	imageTalosBundleCmd.PersistentFlags().BoolVar(&imageTalosBundleCmdFlags.overlays, "overlays", true, "Include images that belong to Talos overlays")
+	imageTalosBundleCmd.PersistentFlags().BoolVar(&imageTalosBundleCmdFlags.extensions, "extensions", true, "Include images that belong to Talos extensions")
+
+	imageCmd.AddCommand(imageDefaultCmd)
 
 	imageCmd.AddCommand(imageCacheCreateCmd)
 	imageCacheCreateCmd.PersistentFlags().StringVar(&imageCacheCreateCmdFlags.imageCachePath, "image-cache-path", "", "directory to save the image cache in OCI format")
diff --git a/hack/release.sh b/hack/release.sh
@@ -23,6 +23,7 @@ function release-notes {
 
   echo -e '\n## Images\n\n```' >> ${1}
   ${ARTIFACTS}/talosctl-linux-amd64 image k8s-bundle >> ${1}
+  ${ARTIFACTS}/talosctl-linux-amd64 image talos-bundle --overlays=false --extensions=false >> ${1}
   echo -e '```\n' >> ${1}
 }
 
diff --git a/hack/release.toml b/hack/release.toml
@@ -21,6 +21,13 @@ preface = """
 Linux: 6.18.5
 
 Talos is built with Go 1.25.6.
+"""
+
+    [notes.talosctl_images_talos_bundle]
+        title = "`talosctl images talos-bundle` can ignore reaching to the registry"
+        description = """\
+The `talosctl images talos-bundle` command now accepts optional `--ovelays` and `--extensions` flags.
+If those are set to `false`, the command will not attempt to reach out to the container registry to fetch the latest versions and digests of the overlays and extensions.
 """
 
 [make_deps]
diff --git a/website/content/v1.12/reference/cli.md b/website/content/v1.12/reference/cli.md
@@ -2211,8 +2211,7 @@ talosctl image k8s-bundle [flags]
 ### Options
 
 ```
-  -h, --help                 help for k8s-bundle
-      --provisioner string   include provisioner specific images (default "installer")
+  -h, --help   help for k8s-bundle
 ```
 
 ### Options inherited from parent commands
@@ -2302,7 +2301,9 @@ talosctl image talos-bundle [talos-version] [flags]
 ### Options
 
 ```
-  -h, --help   help for talos-bundle
+      --extensions   Include images that belong to Talos extensions (default true)
+  -h, --help         help for talos-bundle
+      --overlays     Include images that belong to Talos overlays (default true)
 ```
 
 ### Options inherited from parent commands

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ function release-notes {`
`23`	`23`
`24`	`24`	echo -e '\n## Images\n\n```' >> ${1}
`25`	`25`	`${ARTIFACTS}/talosctl-linux-amd64 image k8s-bundle >> ${1}`
	`26`	`+ ${ARTIFACTS}/talosctl-linux-amd64 image talos-bundle --overlays=false --extensions=false >> ${1}`
`26`	`27`	echo -e '```\n' >> ${1}
`27`	`28`	`}`
`28`	`29`