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

(FACT-3202) Add is_virtual and virtual support for crio #2574

Merged
merged 2 commits into from
Jun 7, 2024

Conversation

lollipopman
Copy link
Contributor

Prior to this change facter returned:

$ facter is_virtual
false
$ facter virtual
physical

After this change facter returns:

$ facter is_virtual
true
$ facter virtual
crio

This change separates out reading pid 1's environment from proc and reading the cgroup information. It also adds a container_other type when the container runtime is not explicitly supported.

@lollipopman lollipopman requested a review from a team as a code owner May 11, 2023 20:07
@puppetlabs-jenkins
Copy link
Collaborator

Can one of the admins verify this patch?

@lollipopman lollipopman force-pushed the crio-container-support branch 2 times, most recently from e93f832 to 0cd5606 Compare May 12, 2023 14:37
@lollipopman
Copy link
Contributor Author

Would love a review if any of the codeowners have a moment?

@lollipopman
Copy link
Contributor Author

friendly bump for a review please

@lollipopman
Copy link
Contributor Author

@joshcooper any chance you would have time to take a gander?

@lollipopman
Copy link
Contributor Author

friendly bump for a review!

@lollipopman
Copy link
Contributor Author

Would love a review, any takers?

@lollipopman
Copy link
Contributor Author

would love a review!

@joshcooper joshcooper added the enhancement New feature or enhancement label Apr 11, 2024
@lollipopman
Copy link
Contributor Author

friendly bump!

@AriaXLi
Copy link
Contributor

AriaXLi commented May 2, 2024

Hi @lollipopman thanks for the PR, could you update your PR so there's no conflicts? Thanks!

@lollipopman
Copy link
Contributor Author

Happy to, pushed, thanks for looking @AriaXLi

@lollipopman lollipopman force-pushed the crio-container-support branch 3 times, most recently from 21afec5 to a6f1604 Compare May 22, 2024 16:58
@lollipopman
Copy link
Contributor Author

@AriaXLi tests are passing, do you think you could take a look? thanks!

@lollipopman
Copy link
Contributor Author

@AriaXLi any chance you could look at this again, before it bitrots? <3

Prior to this commit the safe_readlines wrapper did not support the sep
argument as supported by readlines.
@lollipopman
Copy link
Contributor Author

@joshcooper patch updated, ready for another review

@joshcooper
Copy link
Contributor

joshcooper commented Jun 6, 2024

Thank you @lollipopman looks good, just running tests

Prior to this change facter returned:

    $ facter is_virtual
    false
    $ facter virtual
    physical

After this change facter returns:

    $ facter is_virtual
    true
    $ facter virtual
    crio

This change separates out reading pid 1's environment from proc and
reading the cgroup information. It also adds explicit support for podman
and returns container_other when the container runtime is not explicitly
supported.
@lollipopman
Copy link
Contributor Author

Tests look good, anything else to do @joshcooper?

@joshcooper joshcooper merged commit 3e47ee6 into puppetlabs:main Jun 7, 2024
18 checks passed
@joshcooper
Copy link
Contributor

Thank you @lollipopman!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants