Add more configs in otel agent gateway

songy23 · songy23 · commit b4a0cc10fba2 · 2026-01-15T12:27:46.000-05:00
diff --git a/api/datadoghq/v2alpha1/datadogagent_types.go b/api/datadoghq/v2alpha1/datadogagent_types.go
@@ -1039,6 +1039,11 @@ type OtelAgentGatewayFeatureConfig struct {
 	// +optional
 	// +listType=atomic
 	Ports []*corev1.ContainerPort `json:"ports,omitempty"`
+
+	// FeatureGates to pass to the OTel collector as a comma-separated list.
+	// Example: "component.UseLocalHostAsDefaultHost,connector.datadogconnector.NativeIngest"
+	// +optional
+	FeatureGates *string `json:"featureGates,omitempty"`
 }
 
 // ControlPlaneMonitoringFeatureConfig contains the configuration for the control plane monitoring.
diff --git a/api/datadoghq/v2alpha1/zz_generated.deepcopy.go b/api/datadoghq/v2alpha1/zz_generated.deepcopy.go
diff --git a/api/datadoghq/v2alpha1/zz_generated.openapi.go b/api/datadoghq/v2alpha1/zz_generated.openapi.go
diff --git a/config/crd/bases/v1/datadoghq.com_datadogagentinternals.yaml b/config/crd/bases/v1/datadoghq.com_datadogagentinternals.yaml
@@ -2013,6 +2013,11 @@ spec:
                             Enabled enables the OTel Agent Gateway.
                             Default: false
                           type: boolean
+                        featureGates:
+                          description: |-
+                            FeatureGates to pass to the OTel collector as a comma-separated list.
+                            Example: "component.UseLocalHostAsDefaultHost,connector.datadogconnector.NativeIngest"
+                          type: string
                         ports:
                           description: |-
                             Ports contains the ports that the OTel Collector is listening on.
@@ -10001,6 +10006,11 @@ spec:
                                 Enabled enables the OTel Agent Gateway.
                                 Default: false
                               type: boolean
+                            featureGates:
+                              description: |-
+                                FeatureGates to pass to the OTel collector as a comma-separated list.
+                                Example: "component.UseLocalHostAsDefaultHost,connector.datadogconnector.NativeIngest"
+                              type: string
                             ports:
                               description: |-
                                 Ports contains the ports that the OTel Collector is listening on.
diff --git a/config/crd/bases/v1/datadoghq.com_datadogagentinternals_v1alpha1.json b/config/crd/bases/v1/datadoghq.com_datadogagentinternals_v1alpha1.json
@@ -2107,6 +2107,10 @@
                   "description": "Enabled enables the OTel Agent Gateway.\nDefault: false",
                   "type": "boolean"
                 },
+                "featureGates": {
+                  "description": "FeatureGates to pass to the OTel collector as a comma-separated list.\nExample: \"component.UseLocalHostAsDefaultHost,connector.datadogconnector.NativeIngest\"",
+                  "type": "string"
+                },
                 "ports": {
                   "description": "Ports contains the ports that the OTel Collector is listening on.\nDefaults: otel-grpc:4317 / otel-http:4318.",
                   "items": {
@@ -9958,6 +9962,10 @@
                       "description": "Enabled enables the OTel Agent Gateway.\nDefault: false",
                       "type": "boolean"
                     },
+                    "featureGates": {
+                      "description": "FeatureGates to pass to the OTel collector as a comma-separated list.\nExample: \"component.UseLocalHostAsDefaultHost,connector.datadogconnector.NativeIngest\"",
+                      "type": "string"
+                    },
                     "ports": {
                       "description": "Ports contains the ports that the OTel Collector is listening on.\nDefaults: otel-grpc:4317 / otel-http:4318.",
                       "items": {
diff --git a/config/crd/bases/v1/datadoghq.com_datadogagentprofiles.yaml b/config/crd/bases/v1/datadoghq.com_datadogagentprofiles.yaml
@@ -2013,6 +2013,11 @@ spec:
                                 Enabled enables the OTel Agent Gateway.
                                 Default: false
                               type: boolean
+                            featureGates:
+                              description: |-
+                                FeatureGates to pass to the OTel collector as a comma-separated list.
+                                Example: "component.UseLocalHostAsDefaultHost,connector.datadogconnector.NativeIngest"
+                              type: string
                             ports:
                               description: |-
                                 Ports contains the ports that the OTel Collector is listening on.
diff --git a/config/crd/bases/v1/datadoghq.com_datadogagentprofiles_v1alpha1.json b/config/crd/bases/v1/datadoghq.com_datadogagentprofiles_v1alpha1.json
@@ -2111,6 +2111,10 @@
                       "description": "Enabled enables the OTel Agent Gateway.\nDefault: false",
                       "type": "boolean"
                     },
+                    "featureGates": {
+                      "description": "FeatureGates to pass to the OTel collector as a comma-separated list.\nExample: \"component.UseLocalHostAsDefaultHost,connector.datadogconnector.NativeIngest\"",
+                      "type": "string"
+                    },
                     "ports": {
                       "description": "Ports contains the ports that the OTel Collector is listening on.\nDefaults: otel-grpc:4317 / otel-http:4318.",
                       "items": {
diff --git a/config/crd/bases/v1/datadoghq.com_datadogagents.yaml b/config/crd/bases/v1/datadoghq.com_datadogagents.yaml
@@ -2013,6 +2013,11 @@ spec:
                             Enabled enables the OTel Agent Gateway.
                             Default: false
                           type: boolean
+                        featureGates:
+                          description: |-
+                            FeatureGates to pass to the OTel collector as a comma-separated list.
+                            Example: "component.UseLocalHostAsDefaultHost,connector.datadogconnector.NativeIngest"
+                          type: string
                         ports:
                           description: |-
                             Ports contains the ports that the OTel Collector is listening on.
@@ -10051,6 +10056,11 @@ spec:
                                 Enabled enables the OTel Agent Gateway.
                                 Default: false
                               type: boolean
+                            featureGates:
+                              description: |-
+                                FeatureGates to pass to the OTel collector as a comma-separated list.
+                                Example: "component.UseLocalHostAsDefaultHost,connector.datadogconnector.NativeIngest"
+                              type: string
                             ports:
                               description: |-
                                 Ports contains the ports that the OTel Collector is listening on.
diff --git a/config/crd/bases/v1/datadoghq.com_datadogagents_v2alpha1.json b/config/crd/bases/v1/datadoghq.com_datadogagents_v2alpha1.json
@@ -2107,6 +2107,10 @@
                   "description": "Enabled enables the OTel Agent Gateway.\nDefault: false",
                   "type": "boolean"
                 },
+                "featureGates": {
+                  "description": "FeatureGates to pass to the OTel collector as a comma-separated list.\nExample: \"component.UseLocalHostAsDefaultHost,connector.datadogconnector.NativeIngest\"",
+                  "type": "string"
+                },
                 "ports": {
                   "description": "Ports contains the ports that the OTel Collector is listening on.\nDefaults: otel-grpc:4317 / otel-http:4318.",
                   "items": {
@@ -10023,6 +10027,10 @@
                       "description": "Enabled enables the OTel Agent Gateway.\nDefault: false",
                       "type": "boolean"
                     },
+                    "featureGates": {
+                      "description": "FeatureGates to pass to the OTel collector as a comma-separated list.\nExample: \"component.UseLocalHostAsDefaultHost,connector.datadogconnector.NativeIngest\"",
+                      "type": "string"
+                    },
                     "ports": {
                       "description": "Ports contains the ports that the OTel Collector is listening on.\nDefaults: otel-grpc:4317 / otel-http:4318.",
                       "items": {
diff --git a/docs/configuration.v2alpha1.md b/docs/configuration.v2alpha1.md
@@ -160,6 +160,7 @@ spec:
 | features.otelAgentGateway.conf.configMap.items | Maps a ConfigMap data `key` to a file `path` mount. |
 | features.otelAgentGateway.conf.configMap.name | Is the name of the ConfigMap. |
 | features.otelAgentGateway.enabled | Enables the OTel Agent Gateway. Default: false |
+| features.otelAgentGateway.featureGates | FeatureGates to pass to the OTel collector as a comma-separated list. Example: "component.UseLocalHostAsDefaultHost,connector.datadogconnector.NativeIngest" |
 | features.otelAgentGateway.ports | Contains the ports that the OTel Collector is listening on. Defaults: otel-grpc:4317 / otel-http:4318. |
 | features.otelCollector.conf.configData | ConfigData corresponds to the configuration file content. |
 | features.otelCollector.conf.configMap.items | Maps a ConfigMap data `key` to a file `path` mount. |
diff --git a/docs/configuration_public.md b/docs/configuration_public.md
@@ -330,6 +330,9 @@ spec:
 `features.otelAgentGateway.enabled`
 : Enables the OTel Agent Gateway. Default: false
 
+`features.otelAgentGateway.featureGates`
+: FeatureGates to pass to the OTel collector as a comma-separated list. Example: "component.UseLocalHostAsDefaultHost,connector.datadogconnector.NativeIngest"
+
 `features.otelAgentGateway.ports`
 : Contains the ports that the OTel Collector is listening on. Defaults: otel-grpc:4317 / otel-http:4318.
 
diff --git a/examples/datadogagent/datadog-agent-with-otelagentgateway-simple.yaml b/examples/datadogagent/datadog-agent-with-otelagentgateway-simple.yaml
@@ -0,0 +1,39 @@
+# datadog-agent-with-otelagentgateway-simple.yaml
+# This is a simple example showing how to enable the OTel Agent Gateway
+# with basic configuration options.
+#
+# For a comprehensive example with all available options, see:
+# datadog-agent-with-otelagentgateway.yaml
+
+apiVersion: datadoghq.com/v2alpha1
+kind: DatadogAgent
+metadata:
+  name: datadog
+spec:
+  global:
+    credentials:
+      apiSecret:
+        secretName: datadog-secret
+        keyName: api-key
+
+  features:
+    # Enable OTel Agent Gateway with basic configuration
+    otelAgentGateway:
+      enabled: true
+      # Feature gates to enable specific OTel collector features
+      featureGates: "telemetry.UseLocalHostAsDefaultMetricsAddress"
+
+  override:
+    # Optional: Configure resources, replicas, and security for the gateway
+    otelAgentGateway:
+      # Number of gateway replicas
+      replicas: 2
+      containers:
+        otel-agent:
+          resources:
+            requests:
+              cpu: 200m
+              memory: 512Mi
+            limits:
+              cpu: 500m
+              memory: 1Gi
diff --git a/examples/datadogagent/datadog-agent-with-otelagentgateway.yaml b/examples/datadogagent/datadog-agent-with-otelagentgateway.yaml
@@ -1,7 +1,11 @@
 # datadog-agent-with-otelagentgateway.yaml
-# This example shows how to enable the OTel Agent Gateway component
+# This example shows how to enable and configure the OTel Agent Gateway component.
 # The OTel Agent Gateway runs as a separate deployment and can be used
 # to collect and forward OpenTelemetry data.
+#
+# This example demonstrates all available configuration options including:
+# - Feature-level configuration (feature gates)
+# - Override configuration (replicas, resources, security contexts, node selectors, affinity, tolerations, env, etc.)
 
 apiVersion: datadoghq.com/v2alpha1
 kind: DatadogAgent
@@ -15,12 +19,123 @@ spec:
         keyName: api-key
 
   features:
-    # Enable OTel Agent Gateway
+    # Enable OTel Agent Gateway with feature-level configuration
     otelAgentGateway:
       enabled: true
 
+      # Feature gates to pass to OTel collector as a comma-separated list
+      # These gates enable/disable specific features in the OpenTelemetry Collector
+      featureGates: "telemetry.UseLocalHostAsDefaultMetricsAddress,logs.jsonParserArray"
+
   override:
-    # Optional: Configure the OTel Agent Gateway deployment
+    # Override configuration for fine-grained control over the OTel Agent Gateway deployment
     otelAgentGateway:
-      # Number of replicas for the gateway
+      # Number of replicas for the gateway deployment
       replicas: 2
+
+      # Node selector to schedule gateway pods on specific nodes (commented out for local testing)
+      # nodeSelector:
+      #   kubernetes.io/os: linux
+      #   node-type: observability
+
+      # Affinity configuration for pod scheduling (commented out for local testing)
+      # affinity:
+      #   podAntiAffinity:
+      #     preferredDuringSchedulingIgnoredDuringExecution:
+      #     - weight: 100
+      #       podAffinityTerm:
+      #         labelSelector:
+      #           matchExpressions:
+      #           - key: app
+      #             operator: In
+      #             values:
+      #             - datadog-otel-agent-gateway
+      #         topologyKey: kubernetes.io/hostname
+
+      # Tolerations for scheduling on tainted nodes (commented out for local testing)
+      # tolerations:
+      # - key: "dedicated"
+      #   operator: "Equal"
+      #   value: "otel-gateway"
+      #   effect: "NoSchedule"
+
+      # Priority class for pod scheduling (commented out for local testing)
+      # priorityClassName: high-priority
+
+      # Additional environment variables for all containers in this component
+      env:
+      - name: OTEL_LOG_LEVEL
+        value: "debug"
+      - name: CUSTOM_VAR
+        value: "custom-value"
+
+      # Environment variables from ConfigMaps or Secrets
+      envFrom:
+      - configMapRef:
+          name: otel-gateway-config
+      - secretRef:
+          name: otel-gateway-secrets
+
+      # Custom image configuration (optional)
+      image:
+        name: ddot-collector
+        tag: "7.74.1"
+        pullPolicy: IfNotPresent
+      # Pod-level security context to ensure volumes are writable by non-root user
+      securityContext:
+        runAsUser: 1000
+        runAsGroup: 1000
+        fsGroup: 1000
+        fsGroupChangePolicy: "OnRootMismatch"
+
+      # Configure containers (both init and regular containers use the same map)
+      containers:
+        # Configure the init-volume init container
+        init-volume:
+          resources:
+            requests:
+              cpu: 50m
+              memory: 100Mi
+            limits:
+              cpu: 100m
+              memory: 200Mi
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            runAsNonRoot: true
+            runAsUser: 1000
+            capabilities:
+              drop:
+                - ALL
+
+        # Configure the otel-agent container
+        otel-agent:
+          resources:
+            requests:
+              cpu: 200m
+              memory: 512Mi
+            limits:
+              cpu: 500m
+              memory: 1Gi
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: false
+            runAsNonRoot: true
+            runAsUser: 1000
+            capabilities:
+              drop:
+                - ALL
+          # Additional environment variables specific to this container
+          env:
+          - name: CONTAINER_SPECIFIC_VAR
+            value: "container-value"
+
+      # Additional labels for pods
+      labels:
+        team: observability
+        environment: production
+
+      # Additional annotations for pods
+      annotations:
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "8888"
diff --git a/internal/controller/datadogagent/component/otelagentgateway/default.go b/internal/controller/datadogagent/component/otelagentgateway/default.go
@@ -87,6 +87,11 @@ func defaultPodSpec(dda metav1.Object) corev1.PodSpec {
 						ReadOnly:  false,
 					},
 					common.GetVolumeMountForConfig(),
+					{
+						Name:      "datadog-agent-auth",
+						MountPath: "/etc/datadog-agent/auth",
+						ReadOnly:  false,
+					},
 				},
 				Ports: []corev1.ContainerPort{
 					{
@@ -111,6 +116,12 @@ func defaultPodSpec(dda metav1.Object) corev1.PodSpec {
 				},
 			},
 			common.GetVolumeForConfig(),
+			{
+				Name: "datadog-agent-auth",
+				VolumeSource: corev1.VolumeSource{
+					EmptyDir: &corev1.EmptyDirVolumeSource{},
+				},
+			},
 		},
 	}
 }
diff --git a/internal/controller/datadogagent/feature/otelagentgateway/feature.go b/internal/controller/datadogagent/feature/otelagentgateway/feature.go
diff --git a/internal/controller/datadogagent/feature/otelagentgateway/feature_test.go b/internal/controller/datadogagent/feature/otelagentgateway/feature_test.go
diff --git a/pkg/testutils/builder.go b/pkg/testutils/builder.go
