Combine DS cleanup methods (#1100)

[fanny-jiang]

What does this PR do?

Cherry-pick #1100

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

[codecov-commenter]

Codecov Report

Attention: Patch coverage is 75.83333% with 29 lines in your changes are missing coverage. Please review.

Project coverage is 59.55%. Comparing base (3288792) to head (24a2b72).

Additional details and impacted files

@@            Coverage Diff             @@
##             v1.6    #1153      +/-   ##
==========================================
+ Coverage   59.22%   59.55%   +0.33%     
==========================================
  Files         174      174              
  Lines       21498    21493       -5     
==========================================
+ Hits        12732    12801      +69     
+ Misses       7999     7924      -75     
- Partials      767      768       +1     

Flag	Coverage Δ
unittests	59.55% <75.83%> (+0.33%)	⬆️

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

Files	Coverage Δ
...ontrollers/datadogagent/controller_reconcile_v2.go	50.00% <20.00%> (+0.26%)	⬆️
...rollers/datadogagent/controller_reconcile_agent.go	50.70% <78.26%> (+19.78%)	⬆️

---

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3288792...24a2b72. Read the comment docs.