Skip to content

Commit 6baabfc

Browse files
committed
feat: replace hardcoded artifact image constants with CLI-configurable values.
Adds CLI flags that replace hardcoded image constants. Signed-off-by: Aleksandr Gamzin <[email protected]>
1 parent c27ee27 commit 6baabfc

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

cmd/image-factory/cmd/options.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,14 @@ type Options struct { //nolint:govet
110110

111111
// SecureBoot settings.
112112
SecureBoot SecureBootOptions
113+
114+
// Image references
115+
InstallerBaseImage string
116+
InstallerImage string
117+
ImagerImage string
118+
ExtensionManifestImage string
119+
OverlayManifestImage string
120+
TalosctlImage string
113121
}
114122

115123
// SecureBootOptions configures SecureBoot.
@@ -165,4 +173,11 @@ var DefaultOptions = Options{
165173
CacheS3Bucket: "image-factory",
166174

167175
MetricsListenAddr: ":2122",
176+
177+
InstallerBaseImage: "siderolabs/installer-base",
178+
InstallerImage: "siderolabs/installer",
179+
ImagerImage: "siderolabs/imager",
180+
ExtensionManifestImage: "siderolabs/extensions",
181+
OverlayManifestImage: "siderolabs/overlays",
182+
TalosctlImage: "siderolabs/talosctl-all",
168183
}

cmd/image-factory/flags.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,13 @@ func initFlags() cmd.Options {
9797
flag.StringVar(&opts.SecureBoot.AzureCertificateName, "secureboot-azure-certificate-name", cmd.DefaultOptions.SecureBoot.AzureCertificateName, "Secure Boot Azure Key Vault certificate name (use Azure PKI)") //nolint:lll
9898
flag.StringVar(&opts.SecureBoot.AzureKeyName, "secureboot-azure-key-name", cmd.DefaultOptions.SecureBoot.AzureKeyName, "Secure Boot Azure Key Vault PCR key name (use Azure PKI)")
9999

100+
flag.StringVar(&opts.InstallerBaseImage, "installer-base-image", cmd.DefaultOptions.InstallerBaseImage, "Name of image InstallerBaseImage")
101+
flag.StringVar(&opts.InstallerImage, "installer-image", cmd.DefaultOptions.InstallerImage, "Name of image InstallerImage")
102+
flag.StringVar(&opts.ImagerImage, "imager-image", cmd.DefaultOptions.ImagerImage, "Name of image ImagerImage")
103+
flag.StringVar(&opts.ExtensionManifestImage, "extension-manifest-image", cmd.DefaultOptions.ExtensionManifestImage, "Name of image ExtensionManifestImage")
104+
flag.StringVar(&opts.OverlayManifestImage, "overlay-manifest-image", cmd.DefaultOptions.OverlayManifestImage, "Name of image OverlayManifestImage")
105+
flag.StringVar(&opts.TalosctlImage, "talosctl-image", cmd.DefaultOptions.TalosctlImage, "Name of image TalosctlImage")
106+
100107
opts.LogLevel = zap.LevelFlag("log-level", zap.InfoLevel, "set the logging level")
101108

102109
flag.Parse()

0 commit comments

Comments
 (0)