Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

stable/datadog - Set DD_APM_ENABLED to false in container-agent.yaml template #21510

Merged
merged 10 commits into from
Mar 19, 2020
Merged

stable/datadog - Set DD_APM_ENABLED to false in container-agent.yaml template #21510

merged 10 commits into from
Mar 19, 2020

Conversation

omerli
Copy link
Contributor

@omerli omerli commented Mar 18, 2020 •
edited
Loading

With the new Helm chart, even if datadog.apm.enabled is set to false, it reverts to the docker defaults (true).
Having the trace-agent running in the background is pretty harmless from a resource overhead standpoint, however, the logic of the helm chart will automatically do the 8126 port-forwarding, and since we don't want non-apm customers to have this port exposed, we need to respect the chart settings.

Is this a new chart

NOTE: We're experiencing a high volume of PRs to this repo and reviews will be delayed. Please host your own chart repository and submit your repository to the Helm Hub instead of this repo to make them discoverable to the community. Here is how to submit new chart repositories to the Helm Hub.

What this PR does / why we need it:

Which issue this PR fixes

(optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged)

  • fixes #

Special notes for your reviewer:

Checklist

[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]

  • DCO signed
  • Chart Version bumped
  • Variables are documented in the README.md
  • Title of the PR starts with chart name (e.g. [stable/mychartname])

@helm-bot helm-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 18, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @omerli. Thanks for your PR.

I'm waiting for a helm member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Mar 18, 2020
@k8s-ci-robot k8s-ci-robot requested a review from CharlyF March 18, 2020 02:19
clamoriniere
clamoriniere suggested changes Mar 18, 2020
View reviewed changes
Copy link
Collaborator

@clamoriniere clamoriniere left a comment

Choose a reason for hiding this comment

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

Hi @omerli
Thanks for opening this pull request.

Could you please look at my comment. Also please update the CHANGELOG.md with a fix description and bump the chart version in chart.yaml

stable/datadog/templates/container-agent.yaml Outdated Show resolved Hide resolved
@clamoriniere
Copy link
Collaborator

/assign clamoriniere

@omerli omerli requested a review from clamoriniere March 18, 2020 19:47
@clamoriniere
Copy link
Collaborator

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 18, 2020
@helm-bot helm-bot added Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). size/S Denotes a PR that changes 10-29 lines, ignoring generated files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). labels Mar 19, 2020
@omerli omerli changed the title Set DD_APM_ENABLED stable/datadog - Set DD_APM_ENABLED Mar 19, 2020
@helm-bot helm-bot added Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 19, 2020
carpenike and others added 5 commits March 19, 2020 09:27
@carpenike @omerli
enable deployment annotations, bump chart version (helm#21502)
e3df274 
Signed-off-by: Ryan Holt <ryan@ryanholt.net>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>
@L3n41c @omerli
[stable/datalog] Do not enable the cri check when running on a `doc…
992e4f6 
…ker` setup (helm#21476)

Signed-off-by: Lénaïc Huard <lenaic.huard@datadoghq.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>
@L3n41c @omerli
[stable/datadog] Add some missing syscalls to the system-probe secc…
c95e46c 
…omp profile (helm#21456)

The added syscalls are syscalls that an unconfined `system-probe` would do.

Signed-off-by: Lénaïc Huard <lenaic.huard@datadoghq.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>
@capnajax @omerli
[stable/minio] corrected syntax error in statefulset (helm#21503)
46ef9ae 
* corrected syntax error in statefulset

Signed-off-by: Thomas Wilkinson <thomas.wilkinson@us.ibm.com>

* chart version bump

Signed-off-by: Thomas Wilkinson <thomas.wilkinson@us.ibm.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>
@JeroennC @omerli
[stable/redis-ha] Make emptyDir configurable from values (helm#21489)
8d6f1a3 
Signed-off-by: Jeroen Castelein <jeroencastelein11@gmail.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>
omerli and others added 4 commits March 19, 2020 09:27
@omerli
Set DD_APM_ENABLED
ac5dfbe 
With the new Helm chart, even if `datadog.apm.enabled` is set to false, it reverts to the docker defaults (true). 
Having the trace-agent running in the background is pretty harmless from a resource overhead standpoint, however, the logic of the helm chart will automatically do the 8126 port-forwarding, and since we don't want non-apm customers to have this port exposed, we need to respect the chart settings.

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>
@omerli
Bumped version
6337db6 
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>
@omerli
2.0.12
f13e9be 
Fixed a bug where datadog.apm.enabled was not being respected

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>
@omerli
re-applying the changes
7f99e56 
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>
@helm-bot helm-bot added Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 19, 2020
@helm-bot helm-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 19, 2020
@omerli omerli changed the title stable/datadog - Set DD_APM_ENABLED stable/datadog - Set DD_APM_ENABLED to false in container-agent.yaml template Mar 19, 2020
@clamoriniere
Copy link
Collaborator

/lgtm

Thank you for this fix 👍

@k8s-ci-robot k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 19, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: clamoriniere, omerli

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 19, 2020
@k8s-ci-robot k8s-ci-robot merged commit 0e8c700 into helm:master Mar 19, 2020
fowlie pushed a commit to fowlie/charts that referenced this pull request Mar 20, 2020
@omerli @carpenike
@L3n41c @capnajax @JeroennC
stable/datadog - Set DD_APM_ENABLED to false in container-agent.yaml …
503b634 
…template (helm#21510)

* enable deployment annotations, bump chart version (helm#21502)

Signed-off-by: Ryan Holt <ryan@ryanholt.net>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/datalog] Do not enable the `cri` check when running on a `docker` setup (helm#21476)

Signed-off-by: Lénaïc Huard <lenaic.huard@datadoghq.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/datadog] Add some missing syscalls to the `system-probe` seccomp profile (helm#21456)

The added syscalls are syscalls that an unconfined `system-probe` would do.

Signed-off-by: Lénaïc Huard <lenaic.huard@datadoghq.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/minio] corrected syntax error in statefulset (helm#21503)

* corrected syntax error in statefulset

Signed-off-by: Thomas Wilkinson <thomas.wilkinson@us.ibm.com>

* chart version bump

Signed-off-by: Thomas Wilkinson <thomas.wilkinson@us.ibm.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/redis-ha] Make emptyDir configurable from values (helm#21489)

Signed-off-by: Jeroen Castelein <jeroencastelein11@gmail.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* Set DD_APM_ENABLED

With the new Helm chart, even if `datadog.apm.enabled` is set to false, it reverts to the docker defaults (true). 
Having the trace-agent running in the background is pretty harmless from a resource overhead standpoint, however, the logic of the helm chart will automatically do the 8126 port-forwarding, and since we don't want non-apm customers to have this port exposed, we need to respect the chart settings.

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* Bumped version

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* 2.0.12

Fixed a bug where datadog.apm.enabled was not being respected

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* re-applying the changes

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

Co-authored-by: Ryan Holt <ryan@ryanholt.net>
Co-authored-by: Lénaïc Huard <L3n41c@users.noreply.github.com>
Co-authored-by: Thomas Wilkinson <thomas@capnajax.com>
Co-authored-by: Jeroen Castelein <jeroen.castelein@kpn.com>
irlevesque pushed a commit to quantopian/charts that referenced this pull request Jul 13, 2020
@omerli @carpenike
@L3n41c @capnajax @JeroennC
stable/datadog - Set DD_APM_ENABLED to false in container-agent.yaml …
2cba268 
…template (helm#21510)

* enable deployment annotations, bump chart version (helm#21502)

Signed-off-by: Ryan Holt <ryan@ryanholt.net>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/datalog] Do not enable the `cri` check when running on a `docker` setup (helm#21476)

Signed-off-by: Lénaïc Huard <lenaic.huard@datadoghq.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/datadog] Add some missing syscalls to the `system-probe` seccomp profile (helm#21456)

The added syscalls are syscalls that an unconfined `system-probe` would do.

Signed-off-by: Lénaïc Huard <lenaic.huard@datadoghq.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/minio] corrected syntax error in statefulset (helm#21503)

* corrected syntax error in statefulset

Signed-off-by: Thomas Wilkinson <thomas.wilkinson@us.ibm.com>

* chart version bump

Signed-off-by: Thomas Wilkinson <thomas.wilkinson@us.ibm.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/redis-ha] Make emptyDir configurable from values (helm#21489)

Signed-off-by: Jeroen Castelein <jeroencastelein11@gmail.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* Set DD_APM_ENABLED

With the new Helm chart, even if `datadog.apm.enabled` is set to false, it reverts to the docker defaults (true). 
Having the trace-agent running in the background is pretty harmless from a resource overhead standpoint, however, the logic of the helm chart will automatically do the 8126 port-forwarding, and since we don't want non-apm customers to have this port exposed, we need to respect the chart settings.

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* Bumped version

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* 2.0.12

Fixed a bug where datadog.apm.enabled was not being respected

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* re-applying the changes

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

Co-authored-by: Ryan Holt <ryan@ryanholt.net>
Co-authored-by: Lénaïc Huard <L3n41c@users.noreply.github.com>
Co-authored-by: Thomas Wilkinson <thomas@capnajax.com>
Co-authored-by: Jeroen Castelein <jeroen.castelein@kpn.com>
includerandom pushed a commit to includerandom/helm_charts that referenced this pull request Jul 19, 2020
@omerli @carpenike
@L3n41c @capnajax @JeroennC @includerandom
stable/datadog - Set DD_APM_ENABLED to false in container-agent.yaml …
64875b3 
…template (helm#21510)

* enable deployment annotations, bump chart version (helm#21502)

Signed-off-by: Ryan Holt <ryan@ryanholt.net>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/datalog] Do not enable the `cri` check when running on a `docker` setup (helm#21476)

Signed-off-by: Lénaïc Huard <lenaic.huard@datadoghq.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/datadog] Add some missing syscalls to the `system-probe` seccomp profile (helm#21456)

The added syscalls are syscalls that an unconfined `system-probe` would do.

Signed-off-by: Lénaïc Huard <lenaic.huard@datadoghq.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/minio] corrected syntax error in statefulset (helm#21503)

* corrected syntax error in statefulset

Signed-off-by: Thomas Wilkinson <thomas.wilkinson@us.ibm.com>

* chart version bump

Signed-off-by: Thomas Wilkinson <thomas.wilkinson@us.ibm.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/redis-ha] Make emptyDir configurable from values (helm#21489)

Signed-off-by: Jeroen Castelein <jeroencastelein11@gmail.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* Set DD_APM_ENABLED

With the new Helm chart, even if `datadog.apm.enabled` is set to false, it reverts to the docker defaults (true). 
Having the trace-agent running in the background is pretty harmless from a resource overhead standpoint, however, the logic of the helm chart will automatically do the 8126 port-forwarding, and since we don't want non-apm customers to have this port exposed, we need to respect the chart settings.

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* Bumped version

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* 2.0.12

Fixed a bug where datadog.apm.enabled was not being respected

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* re-applying the changes

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

Co-authored-by: Ryan Holt <ryan@ryanholt.net>
Co-authored-by: Lénaïc Huard <L3n41c@users.noreply.github.com>
Co-authored-by: Thomas Wilkinson <thomas@capnajax.com>
Co-authored-by: Jeroen Castelein <jeroen.castelein@kpn.com>
li-adrienloiseau pushed a commit to li-adrienloiseau/charts that referenced this pull request Jul 29, 2020
@omerli @carpenike
@L3n41c @capnajax @JeroennC @li-adrienloiseau
stable/datadog - Set DD_APM_ENABLED to false in container-agent.yaml …
34ff6ca 
…template (helm#21510)

* enable deployment annotations, bump chart version (helm#21502)

Signed-off-by: Ryan Holt <ryan@ryanholt.net>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/datalog] Do not enable the `cri` check when running on a `docker` setup (helm#21476)

Signed-off-by: Lénaïc Huard <lenaic.huard@datadoghq.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/datadog] Add some missing syscalls to the `system-probe` seccomp profile (helm#21456)

The added syscalls are syscalls that an unconfined `system-probe` would do.

Signed-off-by: Lénaïc Huard <lenaic.huard@datadoghq.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/minio] corrected syntax error in statefulset (helm#21503)

* corrected syntax error in statefulset

Signed-off-by: Thomas Wilkinson <thomas.wilkinson@us.ibm.com>

* chart version bump

Signed-off-by: Thomas Wilkinson <thomas.wilkinson@us.ibm.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/redis-ha] Make emptyDir configurable from values (helm#21489)

Signed-off-by: Jeroen Castelein <jeroencastelein11@gmail.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* Set DD_APM_ENABLED

With the new Helm chart, even if `datadog.apm.enabled` is set to false, it reverts to the docker defaults (true). 
Having the trace-agent running in the background is pretty harmless from a resource overhead standpoint, however, the logic of the helm chart will automatically do the 8126 port-forwarding, and since we don't want non-apm customers to have this port exposed, we need to respect the chart settings.

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* Bumped version

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* 2.0.12

Fixed a bug where datadog.apm.enabled was not being respected

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* re-applying the changes

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

Co-authored-by: Ryan Holt <ryan@ryanholt.net>
Co-authored-by: Lénaïc Huard <L3n41c@users.noreply.github.com>
Co-authored-by: Thomas Wilkinson <thomas@capnajax.com>
Co-authored-by: Jeroen Castelein <jeroen.castelein@kpn.com>
Signed-off-by: Adrien Loiseau <adrien.loiseau@logic-immo.com>
mmingorance-dh pushed a commit to mmingorance-dh/charts that referenced this pull request Aug 28, 2020
@omerli @carpenike
@L3n41c @capnajax @JeroennC
stable/datadog - Set DD_APM_ENABLED to false in container-agent.yaml …
b1c05a2 
…template (helm#21510)

* enable deployment annotations, bump chart version (helm#21502)

Signed-off-by: Ryan Holt <ryan@ryanholt.net>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/datalog] Do not enable the `cri` check when running on a `docker` setup (helm#21476)

Signed-off-by: Lénaïc Huard <lenaic.huard@datadoghq.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/datadog] Add some missing syscalls to the `system-probe` seccomp profile (helm#21456)

The added syscalls are syscalls that an unconfined `system-probe` would do.

Signed-off-by: Lénaïc Huard <lenaic.huard@datadoghq.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/minio] corrected syntax error in statefulset (helm#21503)

* corrected syntax error in statefulset

Signed-off-by: Thomas Wilkinson <thomas.wilkinson@us.ibm.com>

* chart version bump

Signed-off-by: Thomas Wilkinson <thomas.wilkinson@us.ibm.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/redis-ha] Make emptyDir configurable from values (helm#21489)

Signed-off-by: Jeroen Castelein <jeroencastelein11@gmail.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* Set DD_APM_ENABLED

With the new Helm chart, even if `datadog.apm.enabled` is set to false, it reverts to the docker defaults (true). 
Having the trace-agent running in the background is pretty harmless from a resource overhead standpoint, however, the logic of the helm chart will automatically do the 8126 port-forwarding, and since we don't want non-apm customers to have this port exposed, we need to respect the chart settings.

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* Bumped version

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* 2.0.12

Fixed a bug where datadog.apm.enabled was not being respected

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* re-applying the changes

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

Co-authored-by: Ryan Holt <ryan@ryanholt.net>
Co-authored-by: Lénaïc Huard <L3n41c@users.noreply.github.com>
Co-authored-by: Thomas Wilkinson <thomas@capnajax.com>
Co-authored-by: Jeroen Castelein <jeroen.castelein@kpn.com>
Signed-off-by: Miguel Mingorance <miguel.mingorance@deliveryhero.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@gbbr gbbr gbbr left review comments

@CharlyF CharlyF Awaiting requested review from CharlyF

@clamoriniere clamoriniere Awaiting requested review from clamoriniere

Assignees

@clamoriniere clamoriniere

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). lgtm Indicates that a PR is ready to be merged. ok-to-test size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@omerli @k8s-ci-robot @clamoriniere @gbbr @helm-bot @carpenike @L3n41c @capnajax @JeroennC