feat: customize image size

Can possible to change boot image size. Change the default image size for some cloud platform. Signed-off-by: Serge Logvinov <[email protected]> Signed-off-by: Andrey Smirnov <[email protected]>
siderolabs · Oct 16, 2023 · 401e894 · 401e894
1 parent 865f08f
commit 401e894
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/cmd/installer/cmd/imager/root.go b/cmd/installer/cmd/imager/root.go
@@ -7,9 +7,11 @@ package imager
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"runtime"
 
+	"github.com/dustin/go-humanize"
 	"github.com/siderolabs/gen/xslices"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v3"
@@ -27,6 +29,7 @@ var cmdFlags struct {
 	Platform              string
 	Arch                  string
 	Board                 string
+	ImageDiskSize         string
 	ExtraKernelArgs       []string
 	MetaValues            install.MetaValues
 	SystemExtensionImages []string
@@ -94,6 +97,23 @@ var rootCmd = &cobra.Command{
 						ImageRef: cmdFlags.BaseInstallerImage,
 					}
 				}
+
+				if cmdFlags.ImageDiskSize != "" {
+					size, err := humanize.ParseBytes(cmdFlags.ImageDiskSize)
+					if err != nil {
+						return fmt.Errorf("error parsing disk image size: %w", err)
+					}
+
+					if size < profile.MinRAWDiskSize {
+						return fmt.Errorf("disk image size must be at least %s", humanize.Bytes(profile.MinRAWDiskSize))
+					}
+
+					if prof.Output.ImageOptions == nil {
+						prof.Output.ImageOptions = &profile.ImageOptions{}
+					}
+
+					prof.Output.ImageOptions.DiskSize = int64(size)
+				}
 			}
 
 			if err := os.MkdirAll(cmdFlags.OutputPath, 0o755); err != nil {
@@ -136,6 +156,7 @@ func init() {
 	rootCmd.PersistentFlags().StringVar(&cmdFlags.Arch, "arch", runtime.GOARCH, "The target architecture")
 	rootCmd.PersistentFlags().StringVar(&cmdFlags.BaseInstallerImage, "base-installer-image", "", "Base installer image to use")
 	rootCmd.PersistentFlags().StringVar(&cmdFlags.Board, "board", "", "The value of "+constants.KernelParamBoard)
+	rootCmd.PersistentFlags().StringVar(&cmdFlags.ImageDiskSize, "image-disk-size", "", "Set custom disk image size (accepts human readable values, e.g. 6GiB)")
 	rootCmd.PersistentFlags().StringArrayVar(&cmdFlags.ExtraKernelArgs, "extra-kernel-arg", []string{}, "Extra argument to pass to the kernel")
 	rootCmd.PersistentFlags().Var(&cmdFlags.MetaValues, "meta", "A key/value pair for META")
 	rootCmd.PersistentFlags().StringArrayVar(&cmdFlags.SystemExtensionImages, "system-extension-image", []string{}, "The image reference to the system extension to install")

diff --git a/pkg/imager/profile/default.go b/pkg/imager/profile/default.go
@@ -150,7 +150,7 @@ var Default = map[string]Profile{
 			Kind:      OutKindImage,
 			OutFormat: OutFormatXZ,
 			ImageOptions: &ImageOptions{
-				DiskSize:   DefaultRAWDiskSize,
+				DiskSize:   MinRAWDiskSize,
 				DiskFormat: DiskFormatRaw,
 			},
 		},
@@ -162,7 +162,7 @@ var Default = map[string]Profile{
 			Kind:      OutKindImage,
 			OutFormat: OutFormatXZ,
 			ImageOptions: &ImageOptions{
-				DiskSize:   DefaultRAWDiskSize,
+				DiskSize:   MinRAWDiskSize,
 				DiskFormat: DiskFormatRaw,
 			},
 		},
@@ -174,7 +174,7 @@ var Default = map[string]Profile{
 			Kind:      OutKindImage,
 			OutFormat: OutFormatXZ,
 			ImageOptions: &ImageOptions{
-				DiskSize:   DefaultRAWDiskSize,
+				DiskSize:   MinRAWDiskSize,
 				DiskFormat: DiskFormatRaw,
 			},
 		},
@@ -199,7 +199,7 @@ var Default = map[string]Profile{
 			Kind:      OutKindImage,
 			OutFormat: OutFormatXZ,
 			ImageOptions: &ImageOptions{
-				DiskSize:   DefaultRAWDiskSize,
+				DiskSize:   MinRAWDiskSize,
 				DiskFormat: DiskFormatRaw,
 			},
 		},