Fix CRI vs Docker socket path priority. Always try to mount default runtime dir if using standard path to maximize usage of Env AD #320
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.
What does this PR do?
Currently, due to previous defaulting of
DockerSocketPath
, we're always mounting Docker set even if not existing.Motivation
What inspired you to submit this pull request?
Additional Notes
Anything else we should know when reviewing?
Describe your test plan
On a
containerd
deployment, deploy Datadog Agent with bothCriSocket.DockerSocketPath
(to standard, non-existing, path) andCriSocket.CriSocketPath
tocontainerd
socket.The resulting POD manifest should mount
/var/run
asruntimesocketdir
and thecontainerd
check should run properly.