-
Notifications
You must be signed in to change notification settings - Fork 123
[BARX-1009] Use the ddot-collector image by default for the operator #2012
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
base: main
Are you sure you want to change the base?
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #2012 +/- ##
==========================================
+ Coverage 47.00% 47.13% +0.13%
==========================================
Files 255 255
Lines 25302 25356 +54
==========================================
+ Hits 11892 11951 +59
+ Misses 12794 12790 -4
+ Partials 616 615 -1
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report in Codecov by Sentry.
🚀 New features to boost your workflow:
|
a162ea0
to
296bb4c
Compare
51cb481
to
3a36e34
Compare
3a36e34
to
7afbf5c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me (given my operator limitations, take with some🧂) :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Left formatting suggestions for consistency.
43106cc
to
e4733d5
Compare
e4733d5
to
51b0bd3
Compare
internal/controller/datadogagent/feature/otelcollector/feature.go
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Discussed offline, overrides are reconciled after features, so image changes inside a feature are removed if user is specifying a nodeAgent image.name or image.tag. Logs should be kept, but ManageNodeAgent should be simplified accordingly
Co-authored-by: Timothée Bavelier <[email protected]>
1c6260d
to
fb9f7a5
Compare
Name: "gcr.io/datadoghq/agent:7.68.0-full", | ||
}, | ||
expectedOtelImage: "gcr.io/datadoghq/ddot-collector:7.68.0", | ||
expectedAgentImage: "gcr.io/datadoghq/agent:7.68.0-full", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
expectedAgentImage: "gcr.io/datadoghq/agent:7.68.0-full", | |
expectedAgentImage: "gcr.io/datadoghq/agent:7.68.0", |
o.useStandaloneImage = apiutils.NewBoolPointer(true) | ||
} | ||
|
||
// Check agent version for UseStandaloneImage feature support (7.67.0+) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems redundant. This change will be built with default version of 7.67 or later, agentVersion
will be earlier than 7.67 iff version from image override is earlier than 7.67. In such case we set useStandaloneImage = false
.
Then we go through these conditionals where version retrieved from Override leads to no-op block
if apiutils.BoolValue(o.useStandaloneImage) {
} else {
if o.nodeAgentImageOverride != nil {
// [no-op] User has provided an explicit image override, respect it as-is
} else {
// No explicit override, apply the -full suffix logic
// only reachable when `useStandaloneImage` is set to false in DDA.
}
This can be simplified and cleaned up.
What does this PR do?
Changes the logic for the image selection of the otel-agent container.
-full
suffixMotivation
ddot-collector is the recommended way to deploy the Agent.
Additional Notes
Anything else we should know when reviewing?
With image overrides, the user is responsible for setting the right flavor
Minimum Agent Versions
Are there minimum versions of the Datadog Agent and/or Cluster Agent required?
Describe your test plan
Write there any instructions and details you may have to test your PR.
Checklist
bug
,enhancement
,refactoring
,documentation
,tooling
, and/ordependencies
qa/skip-qa
label