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

Do not enable the cri check when running on a docker setup #51

Merged
merged 3 commits into from
Jul 1, 2020

Conversation

L3n41c
Copy link
Member

@L3n41c L3n41c commented Mar 17, 2020

What does this PR do?

Make a clear distinction between the docker and the CRI setup so that only one of docker or cri check is scheduled by the agent.

Motivation

Implement the same logic as the one implemented in the Helm chart with helm/charts#21476.

Additional Notes

@clamoriniere clamoriniere added bug Something isn't working component/controller labels Mar 28, 2020
@clamoriniere clamoriniere added this to the v0.3 milestone May 26, 2020
@L3n41c L3n41c force-pushed the lenaic/docker_vs_cri branch 3 times, most recently from a0a64cb to 5f7102a Compare June 4, 2020 15:13
@codecov-commenter
Copy link

codecov-commenter commented Jun 29, 2020

Codecov Report

Merging #51 into master will increase coverage by 3.01%.
The diff coverage is 72.34%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master      #51      +/-   ##
==========================================
+ Coverage   57.25%   60.27%   +3.01%     
==========================================
  Files          31       31              
  Lines        4216     4579     +363     
==========================================
+ Hits         2414     2760     +346     
- Misses       1620     1622       +2     
- Partials      182      197      +15     
Flag Coverage Δ
#unittests 60.27% <72.34%> (+3.01%) ⬆️
Impacted Files Coverage Δ
...controller/datadogagent/datadogagent_controller.go 26.11% <0.00%> (-0.34%) ⬇️
pkg/controller/datadogagent/utils.go 83.21% <75.55%> (-0.34%) ⬇️
pkg/controller/datadogagent/clusteragent.go 80.12% <0.00%> (+6.64%) ⬆️
pkg/controller/datadogagent/service.go 91.23% <0.00%> (+7.64%) ⬆️

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 434ae0e...59455d2. Read the comment docs.

@L3n41c L3n41c marked this pull request as ready for review June 29, 2020 14:24
@L3n41c L3n41c requested a review from a team as a code owner June 29, 2020 14:24
@clamoriniere clamoriniere merged commit fe7eb70 into master Jul 1, 2020
@clamoriniere clamoriniere deleted the lenaic/docker_vs_cri branch July 1, 2020 11:41
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.

3 participants