Skip to content

Commit e62966d

Browse files
dd-mergequeue[bot]dd-mergequeue[bot]
authored
[mq] working branch - merge b36c662 on top of main at f73b92d
{"baseBranch":"main","baseCommit":"f73b92d30558782a21869bbe62d2cc87bb996f79","createdAt":"2025-05-07T08:52:16.759791Z","headSha":"b36c66239e729208981f368f2b7245d472f57508","id":"2bbdce33-9bbc-4d51-a123-4374dd0a8bf4","priority":"200","pullRequestNumber":"1806","queuedAt":"2025-05-07T08:52:16.759419Z","status":"STATUS_QUEUED"}
2 parents 90e4ce3 + b36c662 commit e62966d

27 files changed

+1564
-3
lines changed

‎charts/datadog/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Datadog changelog
22

3+
## 3.113.0
4+
5+
* Add configuration option for `datadog.kubelet.useApiServer` to get the pod list from the API Server instead of the Kubelet. Disabled by default. This option requires Agent **7.65.0+**.
6+
37
## 3.112.0
48

59
* Upgrade default Agent version to `7.65.0`.

‎charts/datadog/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
apiVersion: v1
33
name: datadog
4-
version: 3.112.0
4+
version: 3.113.0
55
appVersion: "7"
66
description: Datadog Agent
77
keywords:

‎charts/datadog/README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Datadog
22

3-
![Version: 3.112.0](https://img.shields.io/badge/Version-3.112.0-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
3+
![Version: 3.113.0](https://img.shields.io/badge/Version-3.113.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

@@ -785,6 +785,7 @@ helm install <RELEASE_NAME> \
785785
| datadog.kubelet.podLogsPath | string | /var/log/pods on Linux, C:\var\log\pods on Windows | Path (on host) where the PODs logs are located |
786786
| datadog.kubelet.podResourcesSocketDir | string | /var/lib/kubelet/pod-resources | Path (on host) where the kubelet.sock socket for the PodResources API is located |
787787
| datadog.kubelet.tlsVerify | string | true | Toggle kubelet TLS verification |
788+
| datadog.kubelet.useApiServer | bool | false | Enable this to query the pod list from the API Server instead of the Kubelet. (Requires Agent 7.65.0+) |
788789
| datadog.kubernetesEvents.collectedEventTypes | list | `[{"kind":"Pod","reasons":["Failed","BackOff","Unhealthy","FailedScheduling","FailedMount","FailedAttachVolume"]},{"kind":"Node","reasons":["TerminatingEvictedPod","NodeNotReady","Rebooted","HostPortConflict"]},{"kind":"CronJob","reasons":["SawCompletedJob"]}]` | Event types to be collected. This requires datadog.kubernetesEvents.unbundleEvents to be set to true. |
789790
| datadog.kubernetesEvents.filteringEnabled | bool | `false` | Enable this to only include events that match the pre-defined allowed events. (Requires Cluster Agent 7.57.0+). |
790791
| datadog.kubernetesEvents.sourceDetectionEnabled | bool | `false` | Enable this to map Kubernetes events to integration sources based on controller names. (Requires Cluster Agent 7.56.0+). |

‎charts/datadog/templates/_containers-common-env.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,15 @@
2222
- name: DD_KUBELET_TLS_VERIFY
2323
value: {{ .Values.datadog.kubelet.tlsVerify | quote }}
2424
{{- end }}
25+
{{- if .Values.datadog.kubelet.useApiServer | quote }}
26+
- name: DD_KUBELET_USE_API_SERVER
27+
value: {{ .Values.datadog.kubelet.useApiServer | quote }}
28+
{{- end }}
2529
{{- if ne (include "datadog.kubelet.mountPath" .) "" }}
2630
- name: DD_KUBELET_CLIENT_CA
2731
value: {{ include "datadog.kubelet.mountPath" . }}
2832
{{- end }}
29-
{{- if .Values.providers.gke.autopilot }}
33+
{{- if (and .Values.providers.gke.autopilot (not .Values.datadog.kubelet.useApiServer)) }}
3034
- name: DD_KUBERNETES_HTTPS_KUBELET_PORT
3135
value: "0"
3236
{{- end }}

‎charts/datadog/templates/rbac.yaml

+9
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,15 @@ rules:
9292
- nodes/stats
9393
verbs:
9494
- get
95+
{{- if .Values.datadog.kubelet.useApiServer }}
96+
- apiGroups:
97+
- ""
98+
resources:
99+
- pods
100+
verbs:
101+
- get
102+
- list
103+
{{- end }}
95104
- apiGroups: # leader election check
96105
- ""
97106
resources:

‎charts/datadog/values.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,9 @@ datadog:
316316
# datadog.kubelet.podResourcesSocketDir -- Path (on host) where the kubelet.sock socket for the PodResources API is located
317317
# @default -- /var/lib/kubelet/pod-resources
318318
podResourcesSocketDir: /var/lib/kubelet/pod-resources
319+
# datadog.kubelet.useApiServer -- Enable this to query the pod list from the API Server instead of the Kubelet. (Requires Agent 7.65.0+)
320+
# @default -- false
321+
useApiServer: false
319322

320323

321324
# datadog.expvarPort -- Specify the port to expose pprof and expvar to not interfere with the agent metrics port from the cluster-agent, which defaults to 5000

‎test/datadog/baseline/manifests/agent-clusterchecks-deployment_default.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -806,6 +806,8 @@ spec:
806806
valueFrom:
807807
fieldRef:
808808
fieldPath: status.hostIP
809+
- name: DD_KUBELET_USE_API_SERVER
810+
value: "false"
809811
- name: DD_OTLP_CONFIG_LOGS_ENABLED
810812
value: "false"
811813
- name: DD_PROCESS_CONFIG_PROCESS_COLLECTION_ENABLED
@@ -987,6 +989,8 @@ spec:
987989
valueFrom:
988990
fieldRef:
989991
fieldPath: status.hostIP
992+
- name: DD_KUBELET_USE_API_SERVER
993+
value: "false"
990994
- name: DD_OTLP_CONFIG_LOGS_ENABLED
991995
value: "false"
992996
- name: DD_CLUSTER_AGENT_ENABLED
@@ -1107,6 +1111,8 @@ spec:
11071111
valueFrom:
11081112
fieldRef:
11091113
fieldPath: status.hostIP
1114+
- name: DD_KUBELET_USE_API_SERVER
1115+
value: "false"
11101116
- name: DD_OTLP_CONFIG_LOGS_ENABLED
11111117
value: "false"
11121118
image: gcr.io/datadoghq/agent:7.65.0

‎test/datadog/baseline/manifests/daemonset_default.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,8 @@ spec:
771771
valueFrom:
772772
fieldRef:
773773
fieldPath: status.hostIP
774+
- name: DD_KUBELET_USE_API_SERVER
775+
value: "false"
774776
- name: DD_OTLP_CONFIG_LOGS_ENABLED
775777
value: "false"
776778
- name: DD_PROCESS_CONFIG_PROCESS_COLLECTION_ENABLED
@@ -952,6 +954,8 @@ spec:
952954
valueFrom:
953955
fieldRef:
954956
fieldPath: status.hostIP
957+
- name: DD_KUBELET_USE_API_SERVER
958+
value: "false"
955959
- name: DD_OTLP_CONFIG_LOGS_ENABLED
956960
value: "false"
957961
- name: DD_CLUSTER_AGENT_ENABLED
@@ -1072,6 +1076,8 @@ spec:
10721076
valueFrom:
10731077
fieldRef:
10741078
fieldPath: status.hostIP
1079+
- name: DD_KUBELET_USE_API_SERVER
1080+
value: "false"
10751081
- name: DD_OTLP_CONFIG_LOGS_ENABLED
10761082
value: "false"
10771083
image: gcr.io/datadoghq/agent:7.65.0

‎test/datadog/baseline/manifests/default_all.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,8 @@ spec:
771771
valueFrom:
772772
fieldRef:
773773
fieldPath: status.hostIP
774+
- name: DD_KUBELET_USE_API_SERVER
775+
value: "false"
774776
- name: DD_OTLP_CONFIG_LOGS_ENABLED
775777
value: "false"
776778
- name: DD_PROCESS_CONFIG_PROCESS_COLLECTION_ENABLED
@@ -952,6 +954,8 @@ spec:
952954
valueFrom:
953955
fieldRef:
954956
fieldPath: status.hostIP
957+
- name: DD_KUBELET_USE_API_SERVER
958+
value: "false"
955959
- name: DD_OTLP_CONFIG_LOGS_ENABLED
956960
value: "false"
957961
- name: DD_CLUSTER_AGENT_ENABLED
@@ -1072,6 +1076,8 @@ spec:
10721076
valueFrom:
10731077
fieldRef:
10741078
fieldPath: status.hostIP
1079+
- name: DD_KUBELET_USE_API_SERVER
1080+
value: "false"
10751081
- name: DD_OTLP_CONFIG_LOGS_ENABLED
10761082
value: "false"
10771083
image: gcr.io/datadoghq/agent:7.65.0

‎test/datadog/baseline/manifests/default_all_windows.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,8 @@ spec:
771771
valueFrom:
772772
fieldRef:
773773
fieldPath: status.hostIP
774+
- name: DD_KUBELET_USE_API_SERVER
775+
value: "false"
774776
- name: DD_OTLP_CONFIG_LOGS_ENABLED
775777
value: "false"
776778
- name: DD_PROCESS_CONFIG_PROCESS_COLLECTION_ENABLED
@@ -906,6 +908,8 @@ spec:
906908
valueFrom:
907909
fieldRef:
908910
fieldPath: status.hostIP
911+
- name: DD_KUBELET_USE_API_SERVER
912+
value: "false"
909913
- name: DD_OTLP_CONFIG_LOGS_ENABLED
910914
value: "false"
911915
- name: DD_CLUSTER_AGENT_ENABLED
@@ -993,6 +997,8 @@ spec:
993997
valueFrom:
994998
fieldRef:
995999
fieldPath: status.hostIP
1000+
- name: DD_KUBELET_USE_API_SERVER
1001+
value: "false"
9961002
- name: DD_OTLP_CONFIG_LOGS_ENABLED
9971003
value: "false"
9981004
image: gcr.io/datadoghq/agent:7.65.0

‎test/datadog/baseline/manifests/gdc_daemonset_default.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,8 @@ spec:
777777
valueFrom:
778778
fieldRef:
779779
fieldPath: status.hostIP
780+
- name: DD_KUBELET_USE_API_SERVER
781+
value: "false"
780782
- name: DD_NODE_NAME
781783
valueFrom:
782784
fieldRef:
@@ -933,6 +935,8 @@ spec:
933935
valueFrom:
934936
fieldRef:
935937
fieldPath: status.hostIP
938+
- name: DD_KUBELET_USE_API_SERVER
939+
value: "false"
936940
- name: DD_NODE_NAME
937941
valueFrom:
938942
fieldRef:

‎test/datadog/baseline/manifests/gdc_daemonset_logs_collection.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,8 @@ spec:
777777
valueFrom:
778778
fieldRef:
779779
fieldPath: status.hostIP
780+
- name: DD_KUBELET_USE_API_SERVER
781+
value: "false"
780782
- name: DD_NODE_NAME
781783
valueFrom:
782784
fieldRef:
@@ -945,6 +947,8 @@ spec:
945947
valueFrom:
946948
fieldRef:
947949
fieldPath: status.hostIP
950+
- name: DD_KUBELET_USE_API_SERVER
951+
value: "false"
948952
- name: DD_NODE_NAME
949953
valueFrom:
950954
fieldRef:

‎test/datadog/baseline/manifests/gke_autopilot_allowlistedv2workload_default.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -774,6 +774,8 @@ spec:
774774
valueFrom:
775775
fieldRef:
776776
fieldPath: status.hostIP
777+
- name: DD_KUBELET_USE_API_SERVER
778+
value: "false"
777779
- name: DD_KUBERNETES_HTTPS_KUBELET_PORT
778780
value: "0"
779781
- name: HELM_FORCE_RENDER
@@ -927,6 +929,8 @@ spec:
927929
valueFrom:
928930
fieldRef:
929931
fieldPath: status.hostIP
932+
- name: DD_KUBELET_USE_API_SERVER
933+
value: "false"
930934
- name: DD_KUBERNETES_HTTPS_KUBELET_PORT
931935
value: "0"
932936
- name: HELM_FORCE_RENDER
@@ -1042,6 +1046,8 @@ spec:
10421046
valueFrom:
10431047
fieldRef:
10441048
fieldPath: status.hostIP
1049+
- name: DD_KUBELET_USE_API_SERVER
1050+
value: "false"
10451051
- name: DD_KUBERNETES_HTTPS_KUBELET_PORT
10461052
value: "0"
10471053
- name: HELM_FORCE_RENDER

0 commit comments

Comments
 (0)