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

[remote config] move initialization to be independent of agent reconciler #1142

Merged
merged 2 commits into from
Apr 24, 2024

Conversation

celenechang
Copy link
Contributor

@celenechang celenechang commented Apr 17, 2024

What does this PR do?

Move initialization of RC to outside of agent reconcile loop

Add a flag to enable the RC service in main.go

Simplify the endpoint determination a bit

Reorder functions in updater.go a bit

(Generated file changes seem to match what's in main, I will also plan to merge main into this branch soon)

Motivation

What inspired you to submit this pull request?

Additional Notes

Anything else we should know when reviewing?

Minimum Agent Versions

Are there minimum versions of the Datadog Agent and/or Cluster Agent required?

  • Agent: vX.Y.Z
  • Cluster Agent: vX.Y.Z

Describe your test plan

Write there any instructions and details you may have to test your PR.

Checklist

  • PR has at least one valid label: bug, enhancement, refactoring, documentation, tooling, and/or dependencies
  • PR has a milestone or the qa/skip-qa label

@celenechang celenechang added enhancement New feature or request qa/skip-qa labels Apr 17, 2024
@celenechang celenechang requested review from a team as code owners April 17, 2024 16:12
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these generated file changes seem to line up with main

@celenechang celenechang merged commit e4f41f2 into add-remote-config Apr 24, 2024
5 of 9 checks passed
@celenechang celenechang deleted the celene/move_setup branch April 24, 2024 11:47
celenechang added a commit that referenced this pull request Jun 6, 2024
* [add-remote-config] initial commit (#1126)

* Draft of service activation through RC

* various refactoring and updates

* use CWS_DD product, update logger, add statecallbacks

---------

Co-authored-by: Sylvain Baubeau <[email protected]>

* Use agent config for service activation (#1134)

* [remote-config] set up test config

* change product to AgentConfig

* small edits

* Refactor and bump controller-tools version

* Test with mocked Config

* Test e2e

* Merge configs

* Merge configs, send Acknowledges

* Add service initialisation in reconcilier

* Fix tags initialisation

* Fix validation tests

* Fix build test error

---------

Co-authored-by: Celene <[email protected]>

* Add usm service activation (#1141)

* Add usm service activation

* Read CWS config from system-probe and CSPM from security-agent

* Read CWS config from system-probe and CSPM from security-agent

* Add DDSystemProbeServiceMonitoringEnabled to coreAgent container

* move initialization to be independent of agent reconciler (#1142)

* cleanup unneeded changes (#1149)

* [remote-config] add envvars missing from core agent for system probe features (#1170)

* [remote-config] sysprobe socket fixes

* add sysprobe envvars to core container

* add sys probe enabled envvar to where missing

* Fix angeConfig struct (#1187)

* [remote-config] store RC config in dda status (#1196)

* [remote-config] store RC config in dda status

* add layer to config stored in status, apply updates in reconcile feature code

* fix feature config references

* small comment update

* a little cleanup

* update modules

* fix licenses

* fix tests

* updated generated files

* rm two licenses

* small fixes

* properly merge remoteconfig config

* simplify

* update comment

---------

Co-authored-by: Sylvain Baubeau <[email protected]>
Co-authored-by: Momar TOURÉ <[email protected]>
celenechang added a commit that referenced this pull request Jun 6, 2024
* [add-remote-config] initial commit (#1126)

* Draft of service activation through RC

* various refactoring and updates

* use CWS_DD product, update logger, add statecallbacks

---------

Co-authored-by: Sylvain Baubeau <[email protected]>

* Use agent config for service activation (#1134)

* [remote-config] set up test config

* change product to AgentConfig

* small edits

* Refactor and bump controller-tools version

* Test with mocked Config

* Test e2e

* Merge configs

* Merge configs, send Acknowledges

* Add service initialisation in reconcilier

* Fix tags initialisation

* Fix validation tests

* Fix build test error

---------

Co-authored-by: Celene <[email protected]>

* Add usm service activation (#1141)

* Add usm service activation

* Read CWS config from system-probe and CSPM from security-agent

* Read CWS config from system-probe and CSPM from security-agent

* Add DDSystemProbeServiceMonitoringEnabled to coreAgent container

* move initialization to be independent of agent reconciler (#1142)

* cleanup unneeded changes (#1149)

* [remote-config] add envvars missing from core agent for system probe features (#1170)

* [remote-config] sysprobe socket fixes

* add sysprobe envvars to core container

* add sys probe enabled envvar to where missing

* Fix angeConfig struct (#1187)

* [remote-config] store RC config in dda status (#1196)

* [remote-config] store RC config in dda status

* add layer to config stored in status, apply updates in reconcile feature code

* fix feature config references

* small comment update

* a little cleanup

* update modules

* fix licenses

* fix tests

* updated generated files

* rm two licenses

* small fixes

* properly merge remoteconfig config

* simplify

* update comment

---------

Co-authored-by: Sylvain Baubeau <[email protected]>
Co-authored-by: Momar TOURÉ <[email protected]>
celenechang added a commit that referenced this pull request Jun 6, 2024
* [beta] Add remote config (#1215)

* [add-remote-config] initial commit (#1126)

* Draft of service activation through RC

* various refactoring and updates

* use CWS_DD product, update logger, add statecallbacks

---------

Co-authored-by: Sylvain Baubeau <[email protected]>

* Use agent config for service activation (#1134)

* [remote-config] set up test config

* change product to AgentConfig

* small edits

* Refactor and bump controller-tools version

* Test with mocked Config

* Test e2e

* Merge configs

* Merge configs, send Acknowledges

* Add service initialisation in reconcilier

* Fix tags initialisation

* Fix validation tests

* Fix build test error

---------

Co-authored-by: Celene <[email protected]>

* Add usm service activation (#1141)

* Add usm service activation

* Read CWS config from system-probe and CSPM from security-agent

* Read CWS config from system-probe and CSPM from security-agent

* Add DDSystemProbeServiceMonitoringEnabled to coreAgent container

* move initialization to be independent of agent reconciler (#1142)

* cleanup unneeded changes (#1149)

* [remote-config] add envvars missing from core agent for system probe features (#1170)

* [remote-config] sysprobe socket fixes

* add sysprobe envvars to core container

* add sys probe enabled envvar to where missing

* Fix angeConfig struct (#1187)

* [remote-config] store RC config in dda status (#1196)

* [remote-config] store RC config in dda status

* add layer to config stored in status, apply updates in reconcile feature code

* fix feature config references

* small comment update

* a little cleanup

* update modules

* fix licenses

* fix tests

* updated generated files

* rm two licenses

* small fixes

* properly merge remoteconfig config

* simplify

* update comment

---------

Co-authored-by: Sylvain Baubeau <[email protected]>
Co-authored-by: Momar TOURÉ <[email protected]>

* fix generated files

---------

Co-authored-by: Sylvain Baubeau <[email protected]>
Co-authored-by: Momar TOURÉ <[email protected]>
mftoure added a commit that referenced this pull request Oct 3, 2024
* [add-remote-config] initial commit (#1126)

* Draft of service activation through RC

* various refactoring and updates

* use CWS_DD product, update logger, add statecallbacks

---------

Co-authored-by: Sylvain Baubeau <[email protected]>

* Use agent config for service activation (#1134)

* [remote-config] set up test config

* change product to AgentConfig

* small edits

* Refactor and bump controller-tools version

* Test with mocked Config

* Test e2e

* Merge configs

* Merge configs, send Acknowledges

* Add service initialisation in reconcilier

* Fix tags initialisation

* Fix validation tests

* Fix build test error

---------

Co-authored-by: Celene <[email protected]>

* Add usm service activation (#1141)

* Add usm service activation

* Read CWS config from system-probe and CSPM from security-agent

* Read CWS config from system-probe and CSPM from security-agent

* Add DDSystemProbeServiceMonitoringEnabled to coreAgent container

* move initialization to be independent of agent reconciler (#1142)

* cleanup unneeded changes (#1149)

* [remote-config] add envvars missing from core agent for system probe features (#1170)

* [remote-config] sysprobe socket fixes

* add sysprobe envvars to core container

* add sys probe enabled envvar to where missing

* Fix angeConfig struct (#1187)

* [remote-config] store RC config in dda status (#1196)

* [remote-config] store RC config in dda status

* add layer to config stored in status, apply updates in reconcile feature code

* fix feature config references

* small comment update

* a little cleanup

* update modules

* fix licenses

* fix tests

* updated generated files

* rm two licenses

* small fixes

* properly merge remoteconfig config

* simplify

* update comment

---------

Co-authored-by: Sylvain Baubeau <[email protected]>
Co-authored-by: Momar TOURÉ <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request qa/skip-qa
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants