config: Rename PresetConfigurationKey to Preset

This is consistent with the naming used for all other configuration keys.
GingerGeek · Nov 22, 2021 · c82161e · c82161e
1 parent 7707f55
commit c82161e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/cmd/crc/cmd/start.go b/cmd/crc/cmd/start.go
@@ -74,7 +74,7 @@ func runStart(ctx context.Context) (*types.StartResult, error) {
 		NameServer:        config.Get(crcConfig.NameServer).AsString(),
 		PullSecret:        cluster.NewInteractivePullSecretLoader(config),
 		KubeAdminPassword: config.Get(crcConfig.KubeAdminPassword).AsString(),
-		Preset:            config.Get(crcConfig.PresetConfigurationKey).AsString(),
+		Preset:            config.Get(crcConfig.Preset).AsString(),
 	}
 
 	client := newMachine()

diff --git a/pkg/crc/api/handlers.go b/pkg/crc/api/handlers.go
@@ -115,7 +115,7 @@ func getStartConfig(cfg crcConfig.Storage, args client.StartConfig) types.StartC
 		NameServer:        cfg.Get(crcConfig.NameServer).AsString(),
 		PullSecret:        cluster.NewNonInteractivePullSecretLoader(cfg, args.PullSecretFile),
 		KubeAdminPassword: cfg.Get(crcConfig.KubeAdminPassword).AsString(),
-		Preset:            cfg.Get(crcConfig.PresetConfigurationKey).AsString(),
+		Preset:            cfg.Get(crcConfig.Preset).AsString(),
 	}
 }
 

diff --git a/pkg/crc/cluster/pullsecret.go b/pkg/crc/cluster/pullsecret.go
@@ -79,7 +79,7 @@ func NewNonInteractivePullSecretLoader(config crcConfig.Storage, path string) Pu
 func (loader *nonInteractivePullSecretLoader) Value() (string, error) {
 	// If crc is built from an OKD bundle or podman bundle is used, then use the fake pull secret in contants.
 	if crcversion.IsOkdBuild() ||
-		loader.config.Get(crcConfig.PresetConfigurationKey).AsString() == string(preset.Podman) {
+		loader.config.Get(crcConfig.Preset).AsString() == string(preset.Podman) {
 		return constants.OkdPullSecret, nil
 	}
 

diff --git a/pkg/crc/config/settings.go b/pkg/crc/config/settings.go
@@ -31,7 +31,7 @@ const (
 	EnableClusterMonitoring = "enable-cluster-monitoring"
 	AutostartTray           = "autostart-tray"
 	KubeAdminPassword       = "kubeadmin-password"
-	PresetConfigurationKey  = "preset"
+	Preset                  = "preset"
 )
 
 func RegisterSettings(cfg *Config) {
@@ -73,7 +73,7 @@ func RegisterSettings(cfg *Config) {
 	}
 
 	// Preset setting should be on top because CPUs/Memory config depend on it.
-	cfg.AddSetting(PresetConfigurationKey, string(preset.OpenShift), validatePreset, RequiresDeleteMsg,
+	cfg.AddSetting(Preset, string(preset.OpenShift), validatePreset, RequiresDeleteMsg,
 		fmt.Sprintf("Virtal machine preset (alpha feature - valid values are: %s or %s)", preset.Podman, preset.OpenShift))
 	// Start command settings in config
 	cfg.AddSetting(Bundle, constants.DefaultBundlePath, ValidateBundlePath, SuccessfullyApplied,
@@ -133,7 +133,7 @@ func DefaultMem(cfg Storage) int {
 }
 
 func IsOpenShift(cfg Storage) bool {
-	return cfg.Get(PresetConfigurationKey).AsString() == string(preset.OpenShift)
+	return cfg.Get(Preset).AsString() == string(preset.OpenShift)
 }
 
 func defaultNetworkMode() network.Mode {

diff --git a/pkg/crc/preflight/preflight.go b/pkg/crc/preflight/preflight.go
@@ -161,7 +161,7 @@ func StartPreflightChecks(config crcConfig.Storage) error {
 	mode := crcConfig.GetNetworkMode(config)
 	trayAutostart := config.Get(crcConfig.AutostartTray).AsBool()
 	bundlePath := config.Get(crcConfig.Bundle).AsString()
-	preset = config.Get(crcConfig.PresetConfigurationKey).AsString()
+	preset = config.Get(crcConfig.Preset).AsString()
 	if err := doPreflightChecks(config, getPreflightChecks(experimentalFeatures, trayAutostart, mode, bundlePath, preset)); err != nil {
 		return &errors.PreflightError{Err: err}
 	}
@@ -174,7 +174,7 @@ func SetupHost(config crcConfig.Storage, checkOnly bool) error {
 	mode := crcConfig.GetNetworkMode(config)
 	trayAutostart := config.Get(crcConfig.AutostartTray).AsBool()
 	bundlePath := config.Get(crcConfig.Bundle).AsString()
-	preset = config.Get(crcConfig.PresetConfigurationKey).AsString()
+	preset = config.Get(crcConfig.Preset).AsString()
 	logging.Infof("Using bundle path %s", bundlePath)
 	return doFixPreflightChecks(config, getPreflightChecks(experimentalFeatures, trayAutostart, mode, bundlePath, preset), checkOnly)
 }