cleanup getDefaultMachineUser|Image

small refactoring for containers#1603 adn containers#1608 where we no longer have operating
system differences.

Signed-off-by: Brent Baude <[email protected]>

pkg/config/default.go

@@ -653,3 +653,16 @@ func useUserConfigLocations() bool {
 	// GetRootlessUID == -1 on Windows, so exclude negative range
 	return unshare.GetRootlessUID() > 0
 }
+
+// getDefaultImage returns the default machine image stream
+// On Windows this refers to the Fedora major release number
+func getDefaultMachineImage() string {
+	return "testing"
+}
+
+// getDefaultMachineUser returns the user to use for rootless podman
+// This is only for the apple, hyperv, and qemu implementations.
+// WSL's user will be hardcoded in podman to "user"
+func getDefaultMachineUser() string {
+	return "core"
+}

pkg/config/default_linux.go

@@ -17,17 +17,6 @@ func getDefaultCgroupsMode() string {
 	return "enabled"
 }
 
-// getDefaultMachineImage returns the default machine image stream
-// On Linux/Mac, this returns the FCOS stream
-func getDefaultMachineImage() string {
-	return "testing"
-}
-
-// getDefaultMachineUser returns the user to use for rootless podman
-func getDefaultMachineUser() string {
-	return "core"
-}
-
 // getDefaultProcessLimits returns the nproc for the current process in ulimits format
 // Note that nfile sometimes cannot be set to unlimited, and the limit is hardcoded
 // to (oldMaxSize) 1048576 (2^20), see: http://stackoverflow.com/a/1213069/1811501

pkg/config/default_unsupported.go

@@ -5,17 +5,6 @@ package config
 
 import "os"
 
-// getDefaultMachineImage returns the default machine image stream
-// On Linux/Mac, this returns the FCOS stream
-func getDefaultMachineImage() string {
-	return "testing"
-}
-
-// getDefaultMachineUser returns the user to use for rootless podman
-func getDefaultMachineUser() string {
-	return "core"
-}
-
 // isCgroup2UnifiedMode returns whether we are running in cgroup2 mode.
 func isCgroup2UnifiedMode() (isUnified bool, isUnifiedErr error) {
 	return false, nil

pkg/config/default_windows.go

@@ -2,19 +2,6 @@ package config
 
 import "os"
 
-// getDefaultImage returns the default machine image stream
-// On Windows this refers to the Fedora major release number
-func getDefaultMachineImage() string {
-	return "testing"
-}
-
-// getDefaultMachineUser returns the user to use for rootless podman
-// This is only for the hyperv and qemu implementations.  WSL's user
-// will be hardcoded in podman to "user"
-func getDefaultMachineUser() string {
-	return "core"
-}
-
 // isCgroup2UnifiedMode returns whether we are running in cgroup2 mode.
 func isCgroup2UnifiedMode() (isUnified bool, isUnifiedErr error) {
 	return false, nil