feat: add provisioner flag to images default command

Fixes #11925

Signed-off-by: Mateusz Urbanek <mateusz.urbanek@siderolabs.com>

Author: shanduur

cmd/talosctl/cmd/talos/image.go

@@ -18,6 +18,7 @@ import (
 
 	"github.com/dustin/go-humanize"
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 
 	"github.com/siderolabs/talos/cmd/talosctl/pkg/talos/helpers"
 	"github.com/siderolabs/talos/pkg/imager/cache"
@@ -149,7 +150,15 @@ var imageDefaultCmd = &cobra.Command{
 		fmt.Printf("%s\n", images.KubeScheduler)
 		fmt.Printf("%s\n", images.KubeProxy)
 		fmt.Printf("%s\n", images.Kubelet)
-		fmt.Printf("%s\n", images.Installer)
+
+		if slices.Contains([]string{provisionerInstaller, provisionerAll}, imageDefaultCmdFlags.provisioner.String()) {
+			fmt.Printf("%s\n", images.Installer)
+		}
+
+		if slices.Contains([]string{provisionerDocker, provisionerAll}, imageDefaultCmdFlags.provisioner.String()) {
+			fmt.Printf("%s\n", images.Talos)
+		}
+
 		fmt.Printf("%s\n", images.Pause)
 
 		return nil
@@ -305,11 +314,25 @@ var imageCacheCreateCmdFlags struct {
 	force    bool
 }
 
+const (
+	provisionerDocker    = "docker"
+	provisionerInstaller = "installer"
+	provisionerAll       = "all"
+)
+
+var imageDefaultCmdFlags = struct {
+	provisioner pflag.Value
+}{
+	provisioner: helpers.StringChoice(provisionerInstaller, provisionerDocker, provisionerAll),
+}
+
 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(imageCacheCreateCmd)

cmd/talosctl/pkg/talos/helpers/flags.go

@@ -0,0 +1,53 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+package helpers
+
+import (
+	"fmt"
+	"slices"
+
+	"github.com/spf13/pflag"
+)
+
+// choiceValue implements the [pflag.Value] interface.
+type choiceValue struct {
+	value    string
+	validate func(string) error
+}
+
+// Set sets the value of the choice.
+func (f *choiceValue) Set(s string) error {
+	err := f.validate(s)
+	if err != nil {
+		return err
+	}
+
+	f.value = s
+
+	return nil
+}
+
+// Type returns the type of the choice, which must be "string" for [pflag.FlagSet.GetString].
+func (f *choiceValue) Type() string { return "string" }
+
+// String returns the current value of the choice.
+func (f *choiceValue) String() string { return f.value }
+
+// StringChoice returns a [choiceValue] that validates the value against a set
+// of choices. Only the last value will be used if multiple values are set.
+func StringChoice(defaultValue string, otherChoices ...string) pflag.Value {
+	return &choiceValue{
+		value: defaultValue,
+		validate: func(s string) error {
+			choices := slices.Concat(otherChoices, []string{defaultValue})
+
+			if slices.Contains(choices, s) {
+				return nil
+			}
+
+			return fmt.Errorf("must be one of %v", choices)
+		},
+	}
+}

hack/cloud-image-uploader/factory.go

@@ -8,6 +8,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"log"
 	"net/http"
 	"net/url"
 	"os"
@@ -64,6 +65,8 @@ func (f *FactoryDownloader) getArtifact(ctx context.Context, name string) (io.Re
 		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
 
+	log.Printf("requesting artifact: %s", url)
+
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return nil, fmt.Errorf("failed to download image from %q: %w", url, err)
@@ -90,6 +93,8 @@ func (f *FactoryDownloader) saveArtifact(name string, r io.Reader) error {
 	}
 	defer of.Close() //nolint:errcheck
 
+	log.Printf("saving artifact: %s", artifact)
+
 	_, err = io.Copy(of, r)
 	if err != nil {
 		return fmt.Errorf("failed to write image to file %q: %w", artifact, err)

pkg/images/images.go

@@ -31,4 +31,7 @@ var (
 	// DefaultTalosImageRepository is the default container repository for
 	// the talos image.
 	DefaultTalosImageRepository = Registry + "/" + Username + "/" + "talos"
+
+	// DefaultTalosImage is the default talos image.
+	DefaultTalosImage = DefaultTalosImageRepository + ":" + version.Tag
 )

pkg/images/list.go

@@ -24,6 +24,7 @@ type Versions struct {
 	KubeScheduler         string
 
 	Installer string
+	Talos     string
 
 	Pause string
 }
@@ -47,6 +48,7 @@ func List(config config.Config) Versions {
 	images.KubeScheduler = config.Cluster().Scheduler().Image()
 
 	images.Installer = DefaultInstallerImage
+	images.Talos = DefaultTalosImage
 
 	images.Pause = DefaultSandboxImage
 

website/content/v1.12/reference/cli.md

@@ -1900,7 +1900,8 @@ talosctl image default [flags]
 ### Options
 
 ```
-  -h, --help   help for default
+  -h, --help                 help for default
+      --provisioner string   include provisioner specific images (default "installer")
 ```
 
 ### Options inherited from parent commands