CLI fixups (#113)

* Fixup omitempty tag. Causes marshaler to go crazy Signed-off-by: Ettore Di Giacinto <edigiacinto@suse.com> * Bind ELEMENTAL_TARGET to target Signed-off-by: Ettore Di Giacinto <edigiacinto@suse.com>
rancher · Feb 18, 2022 · 9f1859e · 9f1859e
1 parent 22cfa40
commit 9f1859e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/cmd/install.go b/cmd/install.go
@@ -33,6 +33,7 @@ var installCmd = &cobra.Command{
 	Short: "elemental installer",
 	Args:  cobra.MaximumNArgs(1),
 	PreRun: func(cmd *cobra.Command, args []string) {
+		viper.BindEnv("target", "ELEMENTAL_TARGET")
 		viper.BindPFlags(cmd.Flags())
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {

diff --git a/pkg/types/v1/config.go b/pkg/types/v1/config.go
@@ -118,7 +118,7 @@ type RunConfig struct {
 	Reboot           bool   `yaml:"reboot,omitempty" mapstructure:"reboot"`
 	PowerOff         bool   `yaml:"poweroff,omitempty" mapstructure:"poweroff"`
 	DirectoryUpgrade string // configured only via flag, no need to map it to any config
-	ChannelUpgrades  bool   `yaml:"CHANNEL_UPGRADES, omitempty" mapstructure:"CHANNEL_UPGRADES"`
+	ChannelUpgrades  bool   `yaml:"CHANNEL_UPGRADES,omitempty" mapstructure:"CHANNEL_UPGRADES"`
 	UpgradeImage     string `yaml:"UPGRADE_IMAGE,omitempty" mapstructure:"UPGRADE_IMAGE"`
 	RecoveryImage    string `yaml:"RECOVERY_IMAGE,omitempty" mapstructure:"RECOVERY_IMAGE"`
 	RecoveryUpgrade  bool   // configured only via flag, no need to map it to any config