Merge pull request #23841 from jakecorrenti/defaultmachine

Add disclaimer in `podman machine info` manpage

docs/source/markdown/podman-machine-info.1.md

@@ -11,6 +11,12 @@ podman\-machine\-info - Display machine host info
 Display information pertaining to the machine host.
 Rootless only, as all `podman machine` commands can be only be used with rootless Podman.
 
+*Note*: The `DefaultMachine` field in the `Host` output does not suggest that
+one can set a default podman machine via system connections. This value represents
+the current active system connection associated with a podman machine. Regardless
+of the default system connection, the default podman machine will always be
+`podman-machine-default`.
+
 ## OPTIONS
 
 #### **--format**, **-f**=*format*

pkg/domain/entities/machine.go

@@ -28,8 +28,14 @@ type MachineInfo struct {
 
 // MachineHostInfo contains info on the machine host
 type MachineHostInfo struct {
-	Arch             string `json:"Arch"`
-	CurrentMachine   string `json:"CurrentMachine"`
+	Arch           string `json:"Arch"`
+	CurrentMachine string `json:"CurrentMachine"`
+	// TODO(6.0): Change `DefaultName` to `ActiveMachineConnection` to fix address
+	// confusion as shown in https://github.com/containers/podman/issues/23353.
+	// The name `DefaultMachine` can cause confusion with the user in thinking that
+	// they can set a default podman machine via system connections. However,
+	// regardless of which system connection is default, the default podman machine
+	// will always be podman-machine-default.
 	DefaultMachine   string `json:"DefaultMachine"`
 	EventsDir        string `json:"EventsDir"`
 	MachineConfigDir string `json:"MachineConfigDir"`