Skip to content

Commit 8a81fa0

Browse files
fanny-jiangdd-octo-sts[bot]datadog-githubops-containers[bot]
authored
Enable Datadog Operator chart dependency (#2112)
Enable Datadog Operator chart dependency enable dashboards crd chore: update charts - bump version for datadog to 3.140.0 (minor-version) - update changelog for datadog with version 3.140.0 - update readme for datadog chore: update charts - update readme for datadog chore: update charts - update readme for datadog remove existing crds from values chore: update charts - update readme for datadog Merge branch 'main' into fanny/AGENTONB-2603/enable-operator chore: update charts - bump version for datadog to 3.141.0 (minor-version) - update changelog for datadog with version 3.141.0 - update readme for datadog skip rendering CRDs update baselines chore: update charts - update readme for datadog Merge branch 'main' into fanny/AGENTONB-2603/enable-operator chore: update charts - bump version for datadog to 3.142.0 (minor-version) - update readme for datadog rebuild helm dependencies Merge branch 'main' into fanny/AGENTONB-2603/enable-operator update dependencies, baselines Merge branch 'main' into fanny/AGENTONB-2603/enable-operator Merge branch 'main' into fanny/AGENTONB-2603/enable-operator disable DatadogAgent controller Merge branch 'main' into fanny/AGENTONB-2603/enable-operator bump operator dep Merge branch 'main' into fanny/AGENTONB-2603/enable-operator update operator subchart alias Merge branch 'main' into fanny/AGENTONB-2603/enable-operator Merge branch 'main' into fanny/AGENTONB-2603/enable-operator bump version and update baselines enable controllers and crds Merge branch 'main' into fanny/AGENTONB-2603/enable-operator bump deps and update baselines disable monitors and dasboards controllers Merge branch 'main' into fanny/AGENTONB-2603/enable-operator bump operator chart dependency, update baselines chore: update charts - update readme for datadog chore: update charts - update readme for datadog increase ct timeout disable podautoscalers and datadog metrics crd Merge branch 'main' into fanny/AGENTONB-2603/enable-operator Merge branch 'main' into fanny/AGENTONB-2603/enable-operator Co-authored-by: dd-octo-sts[bot] <200755185+dd-octo-sts[bot]@users.noreply.github.com> Co-authored-by: datadog-githubops-containers[bot] <152526959+datadog-githubops-containers[bot]@users.noreply.github.com> Co-authored-by: fanny.jiang <[email protected]>
1 parent 02f6776 commit 8a81fa0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+17569
-8
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
with:
2929
python-version: 3.12
3030
- name: Set up chart-testing
31-
uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992 # v2.6.1
31+
uses: helm/chart-testing-action@6ec842c01de15ebb84c8627d2744a0c2f2755c9f # v2.8.0
3232
- name: Run chart-testing (list-changed)
3333
id: list-changed
3434
env:
@@ -59,7 +59,7 @@ jobs:
5959
with:
6060
python-version: 3.12
6161
- name: Set up chart-testing
62-
uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992 # v2.6.1
62+
uses: helm/chart-testing-action@6ec842c01de15ebb84c8627d2744a0c2f2755c9f # v2.8.0
6363
- name: Run chart-testing (lint)
6464
run: ct lint --config .github/ct.yaml
6565

@@ -156,7 +156,7 @@ jobs:
156156
with:
157157
python-version: 3.12
158158
- name: Set up chart-testing
159-
uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992 # v2.6.1
159+
uses: helm/chart-testing-action@6ec842c01de15ebb84c8627d2744a0c2f2755c9f # v2.8.0
160160
- name: Run chart-testing (install)
161161
run: ct install --config .github/ct.yaml
162162

‎charts/datadog/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Datadog changelog
22

3+
## 3.157.0
4+
5+
* Enable Datadog Operator chart dependency ([#2112](https://github.com/DataDog/helm-charts/pull/2112)).
6+
37
## 3.156.3
48

59
* Fix mounts of `/host/run/systemd` and pod-resources socket in system-probe container when GPU monitoring.

‎charts/datadog/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
apiVersion: v1
33
name: datadog
4-
version: 3.156.3
4+
version: 3.157.0
55
appVersion: "7"
66
description: Datadog Agent
77
keywords:

‎charts/datadog/README.md‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Datadog
22

3-
![Version: 3.156.3](https://img.shields.io/badge/Version-3.156.3-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
3+
![Version: 3.157.0](https://img.shields.io/badge/Version-3.157.0-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
44

55
[Datadog](https://www.datadoghq.com/) is a hosted infrastructure monitoring platform. This chart adds the Datadog Agent to all nodes in your cluster via a DaemonSet. It also optionally depends on the [kube-state-metrics chart](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-state-metrics). For more information about monitoring Kubernetes with Datadog, please refer to the [Datadog documentation website](https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/).
66

@@ -30,6 +30,7 @@ Kubernetes 1.10+ or OpenShift 3.10+, note that:
3030
|------------|------|---------|
3131
| https://helm.datadoghq.com | datadog-crds | 2.13.1 |
3232
| https://helm.datadoghq.com | datadog-csi-driver | 0.4.3 |
33+
| https://helm.datadoghq.com | operator(datadog-operator) | 2.16.0 |
3334
| https://prometheus-community.github.io/helm-charts | kube-state-metrics | 2.13.2 |
3435

3536
## Quick start
@@ -858,6 +859,7 @@ helm install <RELEASE_NAME> \
858859
| datadog.networkPolicy.create | bool | `false` | If true, create NetworkPolicy for all the components |
859860
| datadog.networkPolicy.flavor | string | `"kubernetes"` | Flavor of the network policy to use. Can be: * kubernetes for networking.k8s.io/v1/NetworkPolicy * cilium for cilium.io/v2/CiliumNetworkPolicy |
860861
| datadog.nodeLabelsAsTags | object | `{}` | Provide a mapping of Kubernetes Node Labels to Datadog Tags |
862+
| datadog.operator.enabled | bool | `true` | Enable the Datadog Operator. |
861863
| datadog.orchestratorExplorer.container_scrubbing | object | `{"enabled":true}` | Enable the scrubbing of containers in the kubernetes resource YAML for sensitive information |
862864
| datadog.orchestratorExplorer.customResources | list | `[]` | Defines custom resources for the orchestrator explorer to collect |
863865
| datadog.orchestratorExplorer.enabled | bool | `true` | Set this to false to disable the orchestrator explorer |
@@ -988,6 +990,18 @@ helm install <RELEASE_NAME> \
988990
| kube-state-metrics.serviceAccount.name | string | `nil` | The name of the ServiceAccount to use. |
989991
| kubeVersionOverride | string | `nil` | Override Kubernetes version detection. Useful for GitOps tools like FluxCD that don't expose the real cluster version to Helm |
990992
| nameOverride | string | `nil` | Override name of app |
993+
| operator.datadogAgent.enabled | bool | `false` | Enables Datadog Agent controller Note: The Datadog Agent controller will be enabled by default in a future release. |
994+
| operator.datadogCRDs.crds.datadogAgents | bool | `false` | Set to true to deploy the DatadogAgents CRD |
995+
| operator.datadogCRDs.crds.datadogDashboards | bool | `true` | Set to true to deploy the DatadogDashboard CRD |
996+
| operator.datadogCRDs.crds.datadogGenericResources | bool | `true` | Set to true to deploy the DatadogGenericResource CRD |
997+
| operator.datadogCRDs.crds.datadogMetrics | bool | `false` | Set to true to deploy the DatadogMetrics CRD |
998+
| operator.datadogCRDs.crds.datadogMonitors | bool | `true` | Set to true to deploy the DatadogMonitors CRD |
999+
| operator.datadogCRDs.crds.datadogPodAutoscalers | bool | `false` | Set to true to deploy the DatadogPodAutoscalers CRD |
1000+
| operator.datadogCRDs.crds.datadogSLOs | bool | `true` | Set to true to deploy the DatadogSLO CRD |
1001+
| operator.datadogDashboard.enabled | bool | `false` | Enables the Datadog Dashboard controller |
1002+
| operator.datadogGenericResource.enabled | bool | `true` | Enables the Datadog Generic Resource controller |
1003+
| operator.datadogMonitor.enabled | bool | `false` | Enables the Datadog Monitor controller |
1004+
| operator.datadogSLO.enabled | bool | `true` | Enables the Datadog SLO controller |
9911005
| otelAgentGateway.additionalLabels | object | `{}` | Adds labels to the Agent Gateway Deployment and pods |
9921006
| otelAgentGateway.affinity | object | `{}` | Allow the Gateway Deployment to schedule using affinity rules |
9931007
| otelAgentGateway.autoscaling.annotations | object | `{}` | annotations for OTel Agent Gateway HPA |

‎charts/datadog/requirements.lock‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,8 @@ dependencies:
88
- name: datadog-csi-driver
99
repository: https://helm.datadoghq.com
1010
version: 0.4.3
11-
digest: sha256:8587e304dd5e095bc4a8830c303a69a14c102442c98cf6212f40fbe981071656
12-
generated: "2025-11-28T11:31:11.543538+01:00"
11+
- name: datadog-operator
12+
repository: https://helm.datadoghq.com
13+
version: 2.16.0
14+
digest: sha256:a76464c4171b5f72648fbae108725969fe5dbb44580a018d7915a825cf6a78ba
15+
generated: "2025-12-19T11:21:49.478298-05:00"

‎charts/datadog/requirements.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,8 @@ dependencies:
1313
version: 0.4.3
1414
repository: https://helm.datadoghq.com
1515
condition: datadog.csi.enabled
16+
- name: datadog-operator
17+
version: 2.16.0
18+
repository: https://helm.datadoghq.com
19+
condition: datadog.operator.enabled
20+
alias: operator

‎charts/datadog/templates/NOTES.txt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -780,3 +780,15 @@ This behavior will be adjusted automatically and the Core Agent will be used by
780780
OTel Agent Gateway autoscaling has no effect in Kubernetes version 1.22.x and below
781781

782782
{{- end }}
783+
784+
{{ if .Values.datadog.operator.enabled }}
785+
###################################################################################
786+
#### INFO: Datadog Operator is enabled ####
787+
###################################################################################
788+
Datadog Operator is enabled by default and running.
789+
790+
Learn more about the Datadog Operator: https://docs.datadoghq.com/containers/datadog_operator/
791+
792+
To disable the Datadog Operator, set `datadog.operator.enabled` to `false`.
793+
794+
{{- end }}

‎charts/datadog/values.yaml‎

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1290,7 +1290,15 @@ datadog:
12901290
# datadog.agentDataPlane.image.pullPolicy -- Agent Data Plane image pull policy
12911291
pullPolicy: IfNotPresent
12921292

1293-
# Configuration related to Dynamic Instrumentation for Go services.
1293+
## Datadog Operator
1294+
## * Enable the Datadog Operator chart dependency.
1295+
## * Configure the Datadog Operator sub-chart using the values config, `operator`.
1296+
## For all available Operator chart options see: https://github.com/DataDog/helm-charts/blob/main/charts/datadog-operator/values.yaml
1297+
operator:
1298+
# datadog.operator.enabled -- Enable the Datadog Operator.
1299+
enabled: true
1300+
1301+
# Configuration related to Dynamic Instrumentation for Go services.
12941302
dynamicInstrumentationGo:
12951303
# datadog.dynamicInstrumentationGo.enabled -- Enable Dynamic Instrumentation and Live Debugger for Go services.
12961304
enabled: false
@@ -2723,6 +2731,41 @@ clusterChecksRunner:
27232731
# clusterChecksRunner.ports -- Allows to specify extra ports (hostPorts for instance) for this container
27242732
ports: []
27252733

2734+
operator:
2735+
datadogAgent:
2736+
# operator.datadogAgent.enabled -- Enables Datadog Agent controller
2737+
# Note: The Datadog Agent controller will be enabled by default in a future release.
2738+
enabled: false
2739+
datadogDashboard:
2740+
# operator.datadogDashboard.enabled -- Enables the Datadog Dashboard controller
2741+
enabled: false
2742+
datadogGenericResource:
2743+
# operator.datadogGenericResource.enabled -- Enables the Datadog Generic Resource controller
2744+
enabled: true
2745+
datadogMonitor:
2746+
# operator.datadogMonitor.enabled -- Enables the Datadog Monitor controller
2747+
enabled: false
2748+
datadogSLO:
2749+
# operator.datadogSLO.enabled -- Enables the Datadog SLO controller
2750+
enabled: true
2751+
2752+
datadogCRDs:
2753+
crds:
2754+
# operator.datadogCRDs.crds.datadogAgents -- Set to true to deploy the DatadogAgents CRD
2755+
datadogAgents: false
2756+
# operator.datadogCRDs.crds.datadogMonitors -- Set to true to deploy the DatadogMonitors CRD
2757+
datadogMonitors: true
2758+
# operator.datadogCRDs.crds.datadogSLOs -- Set to true to deploy the DatadogSLO CRD
2759+
datadogSLOs: true
2760+
# operator.datadogCRDs.crds.datadogDashboards -- Set to true to deploy the DatadogDashboard CRD
2761+
datadogDashboards: true
2762+
# operator.datadogCRDs.crds.datadogGenericResources -- Set to true to deploy the DatadogGenericResource CRD
2763+
datadogGenericResources: true
2764+
# operator.datadogCRDs.crds.datadogMetrics -- Set to true to deploy the DatadogMetrics CRD
2765+
datadogMetrics: false
2766+
# operator.datadogCRDs.crds.datadogPodAutoscalers -- Set to true to deploy the DatadogPodAutoscalers CRD
2767+
datadogPodAutoscalers: false
2768+
27262769
datadog-crds:
27272770
crds:
27282771
# datadog-crds.crds.datadogMetrics -- Set to true to deploy the DatadogMetrics CRD

‎test/common/common.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,10 @@ func FilterYamlKeysMultiManifest(manifest string, filterKeys map[string]interfac
155155
return "", fmt.Errorf("couldn't decode manifest for filtering dynamic keys: %s", err)
156156
}
157157

158+
if obj["kind"] == "CustomResourceDefinition" {
159+
continue
160+
}
161+
158162
filterKeysRecursive(&obj, filterKeys)
159163

160164
var buf bytes.Buffer

0 commit comments

Comments
 (0)