Improve support for environment autodiscovery by removing explicit setting of DOCKER_HOST by default with Agent 7.27+ #303
Conversation
This file contains 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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
ahmed-mez
reviewed
May 21, 2021
api/v1alpha1/datadogagent_default.go
Outdated
| // Don't default Docker/CRI paths with Agent >= 7.27.0 | ||
| // Let Env AD do the work for us | ||
| agentTag := utils.GetTagFromImageName(agent.Image.Name) | ||
| if !(agentTag == "latest" || utils.IsAboveMinVersion(agentTag, "7.27.0")) { |
There was a problem hiding this comment.
does this support agent 6 and jmx images?
There was a problem hiding this comment.
Good catch, changed.
ahmed-mez
reviewed
May 21, 2021
| import "github.com/Masterminds/semver/v3" | ||
|
|
||
| // IsAboveMinVersion uses semver to check if `version` is >= minVersion | ||
| func IsAboveMinVersion(version, minVersion string) bool { |
There was a problem hiding this comment.
mind adding a unit test? 🙇
vboulineau
force-pushed
the
vboulineau/ad_env
branch
from
e0d0076
to
f119b3f
Compare
…tting of DOCKER_HOST by default with Agent 7.27+
vboulineau
force-pushed
the
vboulineau/ad_env
branch
from
f119b3f
to
d7b45a7
Compare
Codecov Report
@@ Coverage Diff @@
## main #303 +/- ##
==========================================
- Coverage 58.22% 56.28% -1.94%
==========================================
Files 59 60 +1
Lines 6300 6593 +293
==========================================
+ Hits 3668 3711 +43
- Misses 2362 2608 +246
- Partials 270 274 +4
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
ahmed-mez
approved these changes
Jun 1, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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?
A brief description of the change being made with this pull request.
Motivation
What inspired you to submit this pull request?
Additional Notes
Anything else we should know when reviewing?
Describe your test plan
DOCKER_HOSTshould not be set and/var/runshould be mounted to/host/var/runDOCKER_HOSTshould be set and/var/runshould be mounted to/host/var/run