Fix cluster-agent defaulting to enable it by default #349
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
clamoriniere
force-pushed
the
clamoriniere/fix-cluster-agent-defaulting
branch
from
dda352f
to
1d42c39
Compare
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
clamoriniere
commented
Aug 5, 2021
| @@ -29,7 +29,7 @@ spec: | |||
| - --enable-leader-election | |||
| - --pprof | |||
| image: controller:latest | |||
| imagePullPolicy: Always | |||
| imagePullPolicy: IfNotPresent | |||
There was a problem hiding this comment.
ease local testing
In a specific when the section "spec.clusterAgent" is not provided in the DatadogAgent instance, the cluster-agent is not defaulted to `spec.clusterAgent.enabled:true`. This change fix it, and update the tests according to this new behaviour.
clamoriniere
force-pushed
the
clamoriniere/fix-cluster-agent-defaulting
branch
from
1d42c39
to
4da115f
Compare
Codecov Report
@@ Coverage Diff @@
## main #349 +/- ##
===========================================
+ Coverage 38.11% 63.98% +25.86%
===========================================
Files 63 61 -2
Lines 11237 6694 -4543
===========================================
Hits 4283 4283
+ Misses 6647 2104 -4543
Partials 307 307
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
clamoriniere
commented
Aug 5, 2021
| @@ -123,6 +123,7 @@ var _ = Describe("DatadogAgent Controller", func() { | |||
| It("It should create DaemonSet", func() { | |||
| options := &testutils.NewDatadogAgentOptions{ | |||
| UseEDS: false, | |||
| ClusterAgentDisabled: true, | |||
There was a problem hiding this comment.
to not modify the current test suite since it focus on validating Daemonset creation
clamoriniere
commented
Aug 5, 2021
| @@ -17,7 +17,7 @@ import ( | |||
| type NewDatadogAgentOptions struct { | |||
| ExtraLabels map[string]string | |||
| ExtraAnnotations map[string]string | |||
| ClusterAgentEnabled bool | |||
| ClusterAgentDisabled bool | |||
There was a problem hiding this comment.
convert Enabled to Disabled, because default is now "enabled".
ahmed-mez
approved these changes
Aug 5, 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?
Fix the default of the cluster-agent to all be defaulted to
enabled:true.Motivation
In a specific when the section "spec.clusterAgent" is not provided
in the DatadogAgent instance, the cluster-agent is not defaulted to
spec.clusterAgent.enabled:true.Additional Notes
N/A
Describe your test plan
Deploy the example:
datadog-agent-with-credential-secret.yamlThe cluster-agent should be deployed. Defaulting value can be also
verified by checking the value of
dataddog.status.defaultOverride.clusterAgent.enabled