Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate MachineEnabled and replace with API #1012

Merged
merged 1 commit into from
Apr 25, 2022

Conversation

n1hility
Copy link
Member

Deprecates config.Engine.MachineEnabled, and replaces it with a file marker based API:

machine.IsPodmanMachine replaces MachineEnabled
machine.MachineHostType informs the type unknown, qemu, wsl, etc
machine.IsGvProxyBased used to make specific determinations re gvproxy

This is only a soft deprecation, I assume we want to avoid throwing up lint errors just yet.

Signed-off-by: Jason T. Greene [email protected]

@n1hility
Copy link
Member Author

@rhatdan @TomSweeneyRedHat @Luap99 PTAL when you have a chance, updates per discussion in containers/podman#13908

@rhatdan
Copy link
Member

rhatdan commented Apr 22, 2022

Can you remove machine_enabled=false in pkg/config/containers.conf

@rhatdan
Copy link
Member

rhatdan commented Apr 22, 2022

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 22, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: n1hility, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@n1hility
Copy link
Member Author

Can you remove machine_enabled=false in pkg/config/containers.conf

sure

@n1hility n1hility force-pushed the machine-api branch 2 times, most recently from 7f4b037 to c2d8d2f Compare April 22, 2022 21:12
@rhatdan
Copy link
Member

rhatdan commented Apr 22, 2022

LGTM

1 similar comment
@TomSweeneyRedHat
Copy link
Member

LGTM

libnetwork/network/interface.go Outdated Show resolved Hide resolved
pkg/machine/machine.go Show resolved Hide resolved
machine.IsPodmanMachine replaces MachineEnabled
machine.MachineHostType informs the type unknown, qemu, wsl, etc
machine.IsGvProxyBased used to make specific determinations re gvproxy

Signed-off-by: Jason T. Greene <[email protected]>
@Luap99
Copy link
Member

Luap99 commented Apr 25, 2022

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Apr 25, 2022
@openshift-merge-robot openshift-merge-robot merged commit 04801d2 into containers:main Apr 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants