Add capabilities to disable podman socket forwarding and podman-ready notifications from the guest #9
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
podman-machine is forwarding some podman-specific sockets from the VM to the host, which requires ssh access to the VM and the use of gvproxy. This is not needed by macadam, and is currently detrimental as we want to allow to run unmodified VM images. This commit adds a new `Capabilities` struct to the vmconfigs, which will be used for such optional features. podman-machine will enable socket forwarding, but macadam will be able to opt out of it, and the podman-machine code is modified to only try to forward sockets when the capability is enabled.
Move comment next to the code it applies to instead of having an extra blank line between comment and code.
podman-machine currently adds a `podman-ready` systemd unit to its virtual machine. This unit sends a signal to the host to indicate the guest OS has finished booting. This is unwanted for macadam which aims at running unmodified VM images. This commit uses the Capabilities mechanism to make this podman-machine feature optional.
lstocchi
reviewed
Apr 2, 2025
| gvProxySocket.GetPath(), | ||
| apiSocket.GetPath(), | ||
| logPath.GetPath(), | ||
| } | ||
| if mc.Capabilities.HasReadyUnit { |
There was a problem hiding this comment.
This caused a failure to me bc I already had a machine on my laptop. When trying to delete it to init another one, it failed bc mc.Capabilities is nil
lstocchi
reviewed
Apr 2, 2025
| @@ -195,8 +198,10 @@ func (mc *MachineConfig) Remove(machines map[string]bool, saveIgnition, saveImag | |||
|
|
|||
| mcRemove := func() error { | |||
| var errs []error | |||
| if err := connection.RemoveConnections(machines, mc.Name, mc.Name+"-root"); err != nil { | |||
| errs = append(errs, err) | |||
| if mc.Capabilities.ForwardSockets { | |||
| @@ -209,8 +214,10 @@ func (mc *MachineConfig) Remove(machines map[string]bool, saveIgnition, saveImag | |||
| errs = append(errs, err) | |||
| } | |||
| } | |||
| if err := readySocket.Delete(); err != nil { | |||
| errs = append(errs, err) | |||
| if mc.Capabilities.HasReadyUnit { | |||
lstocchi
reviewed
Apr 2, 2025
| @@ -112,6 +118,8 @@ func Init(opts machineDefine.InitOptions, mp vmconfigs.VMProvider) error { | |||
| } | |||
|
|
|||
| mc.Version = vmconfigs.MachineConfigVersion | |||
| mc.Capabilities = opts.Capabilities | |||
| mc.Capabilities.ForwardSockets = false | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These podman-machine feature are not needed by macadam, and are actually detrimental to our goal of running unmodified cloud images. This work will allow to disable this.