From be9aba7ccdb813e23150cab59c20c9e98a8a3895 Mon Sep 17 00:00:00 2001 From: Jake Correnti Date: Mon, 5 Feb 2024 10:38:49 -0500 Subject: [PATCH] Remove image provenance from `machine inspect` We don't care about the provenance of the machine image, so this is no longer applicable to have when displaying info. Signed-off-by: Jake Correnti --- cmd/podman/machine/inspect.go | 12 +----------- docs/source/markdown/podman-machine-inspect.1.md | 1 - pkg/machine/config.go | 1 - 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/cmd/podman/machine/inspect.go b/cmd/podman/machine/inspect.go index 43fb357488..4e7c5941a0 100644 --- a/cmd/podman/machine/inspect.go +++ b/cmd/podman/machine/inspect.go @@ -67,10 +67,6 @@ func inspect(cmd *cobra.Command, args []string) error { if err != nil { return err } - ignFile, err := mc.IgnitionFile() - if err != nil { - return err - } podmanSocket, podmanPipe, err := mc.ConnectionInfo(provider.VMType()) if err != nil { @@ -83,13 +79,7 @@ func inspect(cmd *cobra.Command, args []string) error { PodmanSocket: podmanSocket, PodmanPipe: podmanPipe, }, - Created: mc.Created, - // TODO This is no longer applicable; we dont care about the provenance - // of the image - Image: machine.ImageConfig{ - IgnitionFile: *ignFile, - ImagePath: *mc.ImagePath, - }, + Created: mc.Created, LastUp: mc.LastUp, Name: mc.Name, Resources: mc.Resources, diff --git a/docs/source/markdown/podman-machine-inspect.1.md b/docs/source/markdown/podman-machine-inspect.1.md index 090bf6d014..0823889804 100644 --- a/docs/source/markdown/podman-machine-inspect.1.md +++ b/docs/source/markdown/podman-machine-inspect.1.md @@ -28,7 +28,6 @@ Print results with a Go template. | .ConfigDir ... | Machine configuration directory location | | .ConnectionInfo ... | Machine connection information | | .Created ... | Machine creation time (string, ISO3601) | -| .Image ... | Machine image config | | .LastUp ... | Time when machine was last booted | | .Name | Name of the machine | | .Resources ... | Resources used by the machine | diff --git a/pkg/machine/config.go b/pkg/machine/config.go index f8babf30c1..27834de7a9 100644 --- a/pkg/machine/config.go +++ b/pkg/machine/config.go @@ -110,7 +110,6 @@ type InspectInfo struct { ConfigDir define.VMFile ConnectionInfo ConnectionConfig Created time.Time - Image ImageConfig LastUp time.Time Name string Resources vmconfigs.ResourceConfig