[datadog-csi-driver] Add dsdStreamHostSocketPath for DSDStreamSocket …

charts/datadog-csi-driver/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.16.0
+
+* Add `sockets.dsdStreamEnabled` (default: `false`) and `sockets.dsdStreamHostSocketPath` to support mounting the DogStatsD stream socket (`dogstatsd_stream_socket`). When enabled, passes `--dsd-stream-host-socket-path` to the driver and mounts the socket directory if it differs from the existing APM/DSD socket directories.
+
 ## 0.15.0
 
 * Enable Single Step Instrumentation (SSI) on GKE Autopilot >= 1.32.1-gke.1729000 by rendering `storage-dir` and `DD_APM_ENABLED`. The DaemonSet now matches the new `datadog-datadog-csi-driver-daemonset-exemption-v1.1.0` WorkloadAllowlist (which exempts the new `storage-dir` hostPath and the `DD_APM_ENABLED` env var), replacing `v1.0.1` in the `AllowlistSynchronizer`.

charts/datadog-csi-driver/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: datadog-csi-driver
 description: Datadog CSI Driver helm chart
 type: application
-version: 0.15.0
+version: 0.16.0
 appVersion: "0.1.0"
 maintainers:
   - name: Datadog

charts/datadog-csi-driver/README.md

@@ -1,6 +1,6 @@
 # datadog-csi-driver
 
-![Version: 0.15.0](https://img.shields.io/badge/Version-0.15.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square)
+![Version: 0.16.0](https://img.shields.io/badge/Version-0.16.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square)
 
 Datadog CSI Driver helm chart
 

charts/datadog-csi-driver/templates/daemonset.yaml

@@ -57,6 +57,9 @@ spec:
           args:
             - --apm-host-socket-path={{ .Values.sockets.apmHostSocketPath }}
             - --dsd-host-socket-path={{ .Values.sockets.dsdHostSocketPath }}
+            {{- if .Values.sockets.dsdStreamEnabled }}
+            - --dsd-stream-host-socket-path={{ .Values.sockets.dsdStreamHostSocketPath }}
+            {{- end }}
           volumeMounts:
             # plugin-dir stores the socket on which CSI node server service is exposed.
             # it is created by the node server and needs to be writeable.
@@ -79,6 +82,11 @@ spec:
               mountPath: {{ (dir .Values.sockets.dsdHostSocketPath) }}
               readOnly: true
             {{- end }}
+            {{- if and .Values.sockets.dsdStreamEnabled (ne (dir .Values.sockets.dsdStreamHostSocketPath) (dir .Values.sockets.apmHostSocketPath)) (ne (dir .Values.sockets.dsdStreamHostSocketPath) (dir .Values.sockets.dsdHostSocketPath)) }}
+            - name: dsd-stream-socket
+              mountPath: {{ (dir .Values.sockets.dsdStreamHostSocketPath) }}
+              readOnly: true
+            {{- end }}
             # write mode is required to perform a volume mount
             # csi driver has to create a subdirectory under /var/lib/kubelet/pods/<pod-uid>/volumes/kubernetes.io~csi/datadog/mount.
             - mountPath: /var/lib/kubelet/pods
@@ -165,3 +173,9 @@ spec:
             path: {{ dir .Values.sockets.dsdHostSocketPath }}
             type: DirectoryOrCreate
           name: dsd-socket
+        {{- if and .Values.sockets.dsdStreamEnabled (ne (dir .Values.sockets.dsdStreamHostSocketPath) (dir .Values.sockets.apmHostSocketPath)) (ne (dir .Values.sockets.dsdStreamHostSocketPath) (dir .Values.sockets.dsdHostSocketPath)) }}
+        - hostPath:
+            path: {{ dir .Values.sockets.dsdStreamHostSocketPath }}
+            type: DirectoryOrCreate
+          name: dsd-stream-socket
+        {{- end }}

charts/datadog-csi-driver/values.yaml

@@ -71,6 +71,14 @@ sockets:
   # Should correspond to `datadog.dsd.hostSocketPath`
   dsdHostSocketPath: /var/run/datadog/dsd.socket
 
+  # dsdStreamEnabled -- Enable mounting of the DogStatsD stream socket.
+  # Should be set to true when `dogstatsd_stream_socket` is configured in the Datadog Agent.
+  dsdStreamEnabled: false
+
+  # dsdStreamHostSocketPath -- Host path of the dsd stream socket.
+  # Should correspond to `dogstatsd_stream_socket` in the Datadog Agent config.
+  dsdStreamHostSocketPath: /var/run/datadog/dsd-stream.socket
+
 ## APM/Single Step Instrumentation (SSI) configuration for the CSI driver.
 ## Note: SSI is not supported on legacy GKE Autopilot clusters (< 1.32.1-gke.1729000)
 apm: