Support extra Orchestrator-Explorer configuration and clusterchecks #348

clamoriniere · 2021-08-04T13:15:20Z

What does this PR do?

Update DatadogAgent CRD to allow custom configuration for the
Orchestrator-Explorer feature.
Create dedicated RBAC for the cluster-check-runners.
Fix several controllers issues.

Motivation

Better support complex deployment with the Orchestrator-Explorer
scheduled as cluster-check

Additional Notes

N/A

Describe your test plan

Deploy the agent with the example datadog-agent-orchestrator-custom-conf.yaml.
You can modify it a bit to remove the spec.features.orchestratorExplorer.conf
section and see that the configuration is updated and the DCA is restarted... to
pick-up the new configuration

github-actions

This pull request does not contain a valid label. Please add one of the following labels: bug, enhancement, documentation

clamoriniere · 2021-08-04T13:18:17Z

api/v1alpha1/datadogagent_default_test.go

@@ -428,7 +437,7 @@ func TestDefaultDatadogAgentSpecAgent(t *testing.T) {
 			},
 		},
 		{
-			name: "sparse config",
+			name: "agent spec sparse config",


I have renamed it because two tests had the same name.

clamoriniere · 2021-08-04T13:19:34Z

api/v1alpha1/datadogagent_default_test.go

-		internal    *OrchestratorExplorerConfig
+		name         string
+		orc          *DatadogFeatures
+		clustercheck bool


I have introduced the clustercheck to keep the tests working as they were.

clamoriniere · 2021-08-04T13:20:29Z

api/v1alpha1/datadogagent_validation.go

@@ -22,7 +22,7 @@ func IsValidDatadogAgent(spec *DatadogAgentSpec) error {
 			}
 		}

-		if spec.Agent.SystemProbe.CustomConfig != nil {
+		if spec.Agent.SystemProbe != nil && spec.Agent.SystemProbe.CustomConfig != nil {


codecov-commenter · 2021-08-04T13:24:07Z

Codecov Report

Merging #348 (2eea21d) into main (1e43add) will increase coverage by 26.26%.
The diff coverage is 71.93%.

❗ Current head 2eea21d differs from pull request most recent head eb3670e. Consider uploading reports for the commit eb3670e to get more accurate results

@@             Coverage Diff             @@
##             main     #348       +/-   ##
===========================================
+ Coverage   38.11%   64.37%   +26.26%     
===========================================
  Files          63       62        -1     
  Lines       11237     6878     -4359     
===========================================
+ Hits         4283     4428      +145     
+ Misses       6647     2134     -4513     
- Partials      307      316        +9

Flag	Coverage Δ
unittests	`64.37% <71.93%> (+26.26%)`	⬆️

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

Impacted Files	Coverage Δ
api/v1alpha1/datadogagent_types.go	`100.00% <ø> (ø)`
api/v1alpha1/datadogagent_validation.go	`0.00% <0.00%> (ø)`
controllers/datadogagent/controller.go	`51.80% <25.00%> (ø)`
...ntrollers/datadogagent/clusterchecksrunner_rbac.go	`50.94% <52.00%> (-13.16%)`	⬇️
controllers/datadogagent/orchestrator.go	`67.24% <67.24%> (ø)`
controllers/datadogagent/kubestatemetrics.go	`85.47% <75.00%> (+0.08%)`	⬆️
controllers/datadogagent/clusteragent.go	`72.24% <78.08%> (+1.79%)`	⬆️
api/v1alpha1/datadogagent_default.go	`83.51% <100.00%> (+0.27%)`	⬆️
controllers/datadogagent/clusterchecksrunner.go	`78.91% <100.00%> (+0.23%)`	⬆️
controllers/datadogagent/common_rbac.go	`76.40% <100.00%> (+2.54%)`	⬆️
... and 4 more

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 1e43add...eb3670e. Read the comment docs.

kayayarai

docs 👍

* Update DatadogAgent CRD to allow custom configuration for the Orchestrator-Explorer feature. * Create dedicated RBAC for the cluster-check-runners. * Fix several controllers issues.

CharlyF · 2021-08-05T22:36:23Z

controllers/datadogagent_controller_test.go

-			})
-
-			By("Activating OrchestratorExplorer", func() {
+			By("Disabeling OrchestratorExplorer", func() {


nit disabling (also here)

CharlyF · 2021-08-05T22:39:09Z

controllers/datadogagent_controller_test.go

@@ -169,16 +169,10 @@ var _ = Describe("DatadogAgent Controller", func() {
 				}, nil)
 			})

-			By("Activating Process", func() {


why removing this test?

I moved it after, and converted to "Disabling Process", because now since Orchestrator is enable by default, it means that process-agent is already running, so the By("Activating Process" ) was doing nothing.

github-actions bot requested changes Aug 4, 2021

View reviewed changes

clamoriniere force-pushed the clamoriniere/orchestrator-clusterchecks branch from 2eea21d to eb3670e Compare August 4, 2021 13:16

clamoriniere commented Aug 4, 2021

View reviewed changes

clamoriniere added this to the v0.7 milestone Aug 4, 2021

clamoriniere added component/controller enhancement New feature or request labels Aug 4, 2021

clamoriniere marked this pull request as ready for review August 4, 2021 15:04

clamoriniere requested review from a team as code owners August 4, 2021 15:04

github-actions bot approved these changes Aug 4, 2021

View reviewed changes

kayayarai approved these changes Aug 4, 2021

View reviewed changes

Support extra Orchestrator-Explorer configuration and clusterchecks

07d9e8a

* Update DatadogAgent CRD to allow custom configuration for the Orchestrator-Explorer feature. * Create dedicated RBAC for the cluster-check-runners. * Fix several controllers issues.

clamoriniere force-pushed the clamoriniere/orchestrator-clusterchecks branch from eb3670e to 07d9e8a Compare August 5, 2021 08:58

CharlyF approved these changes Aug 6, 2021

View reviewed changes

Apply review comments

030d0a9

clamoriniere merged commit b0c187b into main Aug 6, 2021

clamoriniere deleted the clamoriniere/orchestrator-clusterchecks branch August 6, 2021 13:22

ahmed-mez mentioned this pull request Aug 23, 2021

Fix panic in feature override when process or system probe configs are empty #364

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support extra Orchestrator-Explorer configuration and clusterchecks #348

Support extra Orchestrator-Explorer configuration and clusterchecks #348

clamoriniere commented Aug 4, 2021

github-actions bot left a comment

clamoriniere Aug 4, 2021 •

edited

clamoriniere Aug 4, 2021

clamoriniere Aug 4, 2021

codecov-commenter commented Aug 4, 2021 •

edited

kayayarai left a comment

CharlyF Aug 5, 2021

CharlyF Aug 5, 2021

clamoriniere Aug 6, 2021 •

edited

Support extra Orchestrator-Explorer configuration and clusterchecks #348

Support extra Orchestrator-Explorer configuration and clusterchecks #348

Conversation

clamoriniere commented Aug 4, 2021

What does this PR do?

Motivation

Additional Notes

Describe your test plan

github-actions bot left a comment

Choose a reason for hiding this comment

clamoriniere Aug 4, 2021 • edited

Choose a reason for hiding this comment

clamoriniere Aug 4, 2021

Choose a reason for hiding this comment

clamoriniere Aug 4, 2021

Choose a reason for hiding this comment

codecov-commenter commented Aug 4, 2021 • edited

Codecov Report

kayayarai left a comment

Choose a reason for hiding this comment

CharlyF Aug 5, 2021

Choose a reason for hiding this comment

CharlyF Aug 5, 2021

Choose a reason for hiding this comment

clamoriniere Aug 6, 2021 • edited

Choose a reason for hiding this comment

clamoriniere Aug 4, 2021 •

edited

codecov-commenter commented Aug 4, 2021 •

edited

clamoriniere Aug 6, 2021 •

edited