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

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

Merged
merged 1 commit into from
Jun 9, 2021

Conversation

vboulineau
Copy link
Contributor

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 both CriSocket.DockerSocketPath (to standard, non-existing, path) and CriSocket.CriSocketPath to containerd socket.
The resulting POD manifest should mount /var/run as runtimesocketdir and the containerd check should run properly.

…untime dir if using standard path to maximize usage of Env AD
@vboulineau vboulineau added bug Something isn't working component/controller labels Jun 9, 2021
@vboulineau vboulineau added this to the v0.7 milestone Jun 9, 2021
@vboulineau vboulineau requested a review from a team as a code owner June 9, 2021 12:15
@codecov-commenter
Copy link

Codecov Report

Merging #320 (164080a) into main (8072ba9) will increase coverage by 22.83%.
The diff coverage is 25.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##             main     #320       +/-   ##
===========================================
+ Coverage   35.55%   58.39%   +22.83%     
===========================================
  Files          62       60        -2     
  Lines       10667     6362     -4305     
===========================================
- Hits         3793     3715       -78     
+ Misses       6592     2371     -4221     
+ Partials      282      276        -6     
Flag Coverage Δ
unittests 58.39% <25.00%> (+22.83%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
controllers/datadogagent/utils.go 81.42% <25.00%> (-0.13%) ⬇️
api/v1alpha1/zz_generated.deepcopy.go
api/v1alpha1/zz_generated.openapi.go

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8072ba9...164080a. Read the comment docs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working component/controller
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants