fix(Containers resolver): properly detect Docker runtime in containers (#2781) #2786
Conversation
This file contains hidden or 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
puppetlabs#2781) Previously, the `Containers` resolver would always return a value from `read_environ`, preventing `read_cgroup` from being called. As a result, the `hypervisors` and `virtual` facts were often set incorrectly to `container_other` and displayed a misleading warning. Changes in this commit: - `read_cgroup` now returns early unless Docker or LXC matches are found. - `read_environ` returns `nil` when encountering an unsupported container. - If both methods return `nil`, `vm` defaults to `container_other` with a warning. These updates ensure that Facter correctly detects Docker and properly reports the `virtual` and `hypervisors` facts when running inside a Docker container.
|
Can one of the admins verify this patch? |
|
|
|
looks good to me, thanks |
joshcooper
reviewed
Jan 28, 2025
… to allow VirtualDetector to continue it's checks
|
+1 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
Previously, the
Containersresolver would always return a value fromread_environ, preventingread_cgroupfrom being called. As a result, thehypervisorsandvirtualfacts were often set incorrectly tocontainer_otherand displayed a misleading warning.Changes in this commit:
read_cgroupnow returns early unless Docker or LXC matches are found.read_environreturnsnilwhen encountering an unsupported container.nil,vmdefaults tocontainer_otherwith a warning.These updates ensure that Facter correctly detects Docker and properly reports the
virtualandhypervisorsfacts when running inside a Docker container.issue: (#2781)