feat(datadog-operator): enable Linux ADP default

charts/datadog-operator/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.26.0-dev.5
+
+* feat(datadog-operator): enable Linux ADP default ([#2879](https://github.com/DataDog/helm-charts/pull/2879)).
+
 ## 2.26.0-dev.4
 
 * Stop rendering unsupported ExtendedDaemonSet and registry override settings ([#2875](https://github.com/DataDog/helm-charts/pull/2875)).

charts/datadog-operator/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: datadog-operator
-version: 2.26.0-dev.4
+version: 2.26.0-dev.5
 appVersion: 1.30.0-rc.2
 description: Datadog Operator
 keywords:

charts/datadog-operator/README.md

@@ -1,6 +1,6 @@
 # Datadog Operator
 
-![Version: 2.26.0-dev.4](https://img.shields.io/badge/Version-2.26.0--dev.4-informational?style=flat-square) ![AppVersion: 1.30.0-rc.2](https://img.shields.io/badge/AppVersion-1.30.0--rc.2-informational?style=flat-square)
+![Version: 2.26.0-dev.5](https://img.shields.io/badge/Version-2.26.0--dev.5-informational?style=flat-square) ![AppVersion: 1.30.0-rc.2](https://img.shields.io/badge/AppVersion-1.30.0--rc.2-informational?style=flat-square)
 
 ## Values
 
@@ -36,6 +36,7 @@
 | datadogMonitor.enabled | bool | `false` | Enables the Datadog Monitor controller |
 | datadogSLO.enabled | bool | `false` | Enables the Datadog SLO controller |
 | dd_url | string | `nil` | The host of the Datadog intake server to send Agent data to, only set this option if you need the Agent to send data to a custom URL |
+| defaultDataPlaneEnabled.linux | bool | `true` | Enables Agent Data Plane by default for Linux Operator-managed workloads using Agent 7.83 or later when `spec.features.dataPlane.enabled` is absent. An explicit `spec.features.dataPlane.enabled` setting overrides this value. Windows is not affected and is handled separately. |
 | deployment.annotations | object | `{}` | Allows setting additional annotations for the deployment resource |
 | dnsConfig | object | `{}` | Specify DNS configuration options for Datadog Operator PODs |
 | env | list | `[]` | Define any environment variables to be passed to the operator. |

charts/datadog-operator/templates/deployment.yaml

@@ -132,6 +132,8 @@ spec:
             - name: DD_URL
               value: {{ default .Values.dd_url (include "get-endpoint-config-data-key" (list . "dd-url")) }}
             {{- end }}
+            - name: DD_DEFAULT_DATA_PLANE_LINUX_ENABLED
+              value: {{ .Values.defaultDataPlaneEnabled.linux | quote }}
             {{- if and (semverCompare ">=1.28.0-0" $version) .Values.untaintController.enabled }}
             {{- if .Values.untaintController.timeout }}
             - name: DD_UNTAINT_CONTROLLER_TIMEOUT

charts/datadog-operator/values.yaml

@@ -74,6 +74,9 @@ datadogAgentProfile:
 supportExtendedDaemonset: "false"
 # operatorMetricsEnabled -- Enable forwarding of Datadog Operator metrics and events to Datadog.
 operatorMetricsEnabled: "true"
+defaultDataPlaneEnabled:
+  # defaultDataPlaneEnabled.linux -- Enables Agent Data Plane by default for Linux Operator-managed workloads using Agent 7.83 or later when `spec.features.dataPlane.enabled` is absent. An explicit `spec.features.dataPlane.enabled` setting overrides this value. Windows is not affected and is handled separately.
+  linux: true
 # metricsPort -- Port used for OpenMetrics endpoint
 metricsPort: 8383
 secretBackend:

test/datadog-operator/baseline/Operator_Deployment_default.yaml

@@ -7,7 +7,7 @@ metadata:
   namespace: datadog-agent
   labels:
     app.kubernetes.io/name: datadog-operator
-    helm.sh/chart: datadog-operator-2.26.0-dev.3
+    helm.sh/chart: datadog-operator-2.26.0-dev.5
     app.kubernetes.io/instance: datadog-operator
     app.kubernetes.io/version: "1.30.0-rc.2"
     app.kubernetes.io/managed-by: Helm
@@ -56,6 +56,8 @@ spec:
                   fieldPath: metadata.namespace
             - name: DD_TOOL_VERSION
               value: helm
+            - name: DD_DEFAULT_DATA_PLANE_LINUX_ENABLED
+              value: "true"
           args:
             - "-logEncoder=json"
             - "-metrics-addr=:8383"

test/datadog-operator/operator_deployment_test.go

@@ -45,6 +45,44 @@ func Test_operator_chart(t *testing.T) {
 			assertions: verifyDeployment,
 			skipTest:   SkipTest,
 		},
+		{
+			name: "defaultDataPlaneEnabled linux default renders true",
+			command: common.HelmCommand{
+				ReleaseName: "datadog-operator",
+				ChartPath:   "../../charts/datadog-operator",
+				ShowOnly:    []string{"templates/deployment.yaml"},
+				Values:      []string{"../../charts/datadog-operator/values.yaml"},
+				Overrides:   map[string]string{},
+			},
+			assertions: func(t *testing.T, manifest string) {
+				var deployment appsv1.Deployment
+				common.Unmarshal(t, manifest, &deployment)
+				operatorContainer := deployment.Spec.Template.Spec.Containers[0]
+				assert.Contains(t, operatorContainer.Env, v1.EnvVar{Name: "DD_DEFAULT_DATA_PLANE_LINUX_ENABLED", Value: "true"})
+				assert.NotContains(t, operatorContainer.Env, v1.EnvVar{Name: "DD_DEFAULT_DATA_PLANE_LINUX_ENABLED", Value: "false"})
+			},
+			skipTest: SkipTest,
+		},
+		{
+			name: "defaultDataPlaneEnabled linux false renders false",
+			command: common.HelmCommand{
+				ReleaseName: "datadog-operator",
+				ChartPath:   "../../charts/datadog-operator",
+				ShowOnly:    []string{"templates/deployment.yaml"},
+				Values:      []string{"../../charts/datadog-operator/values.yaml"},
+				Overrides: map[string]string{
+					"defaultDataPlaneEnabled.linux": "false",
+				},
+			},
+			assertions: func(t *testing.T, manifest string) {
+				var deployment appsv1.Deployment
+				common.Unmarshal(t, manifest, &deployment)
+				operatorContainer := deployment.Spec.Template.Spec.Containers[0]
+				assert.Contains(t, operatorContainer.Env, v1.EnvVar{Name: "DD_DEFAULT_DATA_PLANE_LINUX_ENABLED", Value: "false"})
+				assert.NotContains(t, operatorContainer.Env, v1.EnvVar{Name: "DD_DEFAULT_DATA_PLANE_LINUX_ENABLED", Value: "true"})
+			},
+			skipTest: SkipTest,
+		},
 		{
 			name: "Rendering all does not fail",
 			command: common.HelmCommand{