Skip to content

Commit 6a4fbb2

Browse files
praveenkumaranjannath
authored andcommitted
Revert "config: Force use of podman preset on M1 CPUs"
We now have a way to create ocp bundles for M1 so reverting this PR. This reverts commit b14fb9d.
1 parent 2686dd6 commit 6a4fbb2

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

pkg/crc/config/settings.go

+2-8
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,8 @@ func RegisterSettings(cfg *Config) {
5656
}
5757

5858
// Preset setting should be on top because CPUs/Memory config depend on it.
59-
if runtime.GOOS != "darwin" || runtime.GOARCH != "arm64" {
60-
cfg.AddSetting(Preset, string(preset.OpenShift), validatePreset, RequiresDeleteAndSetupMsg,
61-
fmt.Sprintf("Virtual machine preset (alpha feature - valid values are: %s, %s and %s)", preset.Podman, preset.OpenShift, preset.OKD))
62-
}
59+
cfg.AddSetting(Preset, string(preset.OpenShift), validatePreset, RequiresDeleteAndSetupMsg,
60+
fmt.Sprintf("Virtual machine preset (alpha feature - valid values are: %s, %s and %s)", preset.Podman, preset.OpenShift, preset.OKD))
6361
// Start command settings in config
6462
cfg.AddSetting(Bundle, defaultBundlePath(cfg), validateBundlePath, SuccessfullyApplied,
6563
fmt.Sprintf("Bundle path (string, default '%s')", defaultBundlePath(cfg)))
@@ -124,10 +122,6 @@ func defaultBundlePath(cfg Storage) string {
124122
}
125123

126124
func GetPreset(config Storage) preset.Preset {
127-
if runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" {
128-
return preset.Podman
129-
}
130-
131125
return preset.ParsePreset(config.Get(Preset).AsString())
132126
}
133127

0 commit comments

Comments
 (0)