Skip to content

Commit

Permalink
Revert "Add PodResources mount" (#1708)
Browse files Browse the repository at this point in the history
* Revert "Merge #1696: Add PodResources mount"

This reverts commit 146a161.

* bump chart
  • Loading branch information
celenechang authored Feb 19, 2025
1 parent 146a161 commit 645031f
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 16 deletions.
4 changes: 4 additions & 0 deletions charts/datadog/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Datadog changelog

## 3.93.0

* Revert "Add a mount for the Kubernetes PodResources socket."

## 3.92.0

* Add a mount for the Kubernetes PodResources socket.
Expand Down
2 changes: 1 addition & 1 deletion charts/datadog/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
apiVersion: v1
name: datadog
version: 3.92.0
version: 3.93.0
appVersion: "7"
description: Datadog Agent
keywords:
Expand Down
3 changes: 1 addition & 2 deletions charts/datadog/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Datadog

![Version: 3.92.0](https://img.shields.io/badge/Version-3.92.0-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
![Version: 3.93.0](https://img.shields.io/badge/Version-3.93.0-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)

[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/).

Expand Down Expand Up @@ -775,7 +775,6 @@ helm install <RELEASE_NAME> \
| datadog.kubelet.host | object | `{"valueFrom":{"fieldRef":{"fieldPath":"status.hostIP"}}}` | Override kubelet IP |
| datadog.kubelet.hostCAPath | string | None (no mount from host) | Path (on host) where the Kubelet CA certificate is stored |
| datadog.kubelet.podLogsPath | string | /var/log/pods on Linux, C:\var\log\pods on Windows | Path (on host) where the PODs logs are located |
| datadog.kubelet.podResourcesSocketDir | string | /var/lib/kubelet/pod-resources | Path (on host) where the kubelet.sock socket for the PodResources API is located |
| datadog.kubelet.tlsVerify | string | true | Toggle kubelet TLS verification |
| 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. |
| datadog.kubernetesEvents.filteringEnabled | bool | `false` | Enable this to only include events that match the pre-defined allowed events. (Requires Cluster Agent 7.57.0+). |
Expand Down
7 changes: 1 addition & 6 deletions charts/datadog/templates/_container-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
value: {{ .Values.datadog.checksCardinality | quote }}
{{- end }}
- name: DD_CONTAINER_LIFECYCLE_ENABLED
value: {{ .Values.datadog.containerLifecycle.enabled | quote | default "true" }}
value: {{ .Values.datadog.containerLifecycle.enabled | quote | default "true" }}
- name: DD_ORCHESTRATOR_EXPLORER_ENABLED
value: {{ (include "should-enable-k8s-resource-monitoring" .) | quote }}
- name: DD_EXPVAR_PORT
Expand Down Expand Up @@ -207,8 +207,6 @@
- name: DD_OTELCOLLECTOR_ENABLED
value: "true"
{{- end }}
- name: DD_KUBERNETES_KUBELET_PODRESOURCES_SOCKET
value: {{ printf "%s/kubelet.sock" .Values.datadog.kubelet.podResourcesSocket | quote }}
{{- include "additional-env-entries" .Values.agents.containers.agent.env | indent 4 }}
{{- include "additional-env-dict-entries" .Values.agents.containers.agent.envDict | indent 4 }}
volumeMounts:
Expand Down Expand Up @@ -357,9 +355,6 @@
- name: kubelet-cert-volume
mountPath: /certs
{{- end }}
- name: pod-resources-socket
mountPath: {{ .Values.datadog.kubelet.podResourcesSocketDir }}
readOnly: false
{{- if .Values.agents.volumeMounts }}
{{ toYaml .Values.agents.volumeMounts | indent 4 }}
{{- end }}
Expand Down
3 changes: 0 additions & 3 deletions charts/datadog/templates/_daemonset-volumes-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,6 @@
secretName: datadog-kubelet-cert
name: kubelet-cert-volume
{{- end }}
- name: pod-resources-socket
hostPath:
path: {{ .Values.datadog.kubelet.podResourcesSocketDir }}
{{- if .Values.datadog.gpuMonitoring.enabled }}
- name: gpu-devices
hostPath:
Expand Down
4 changes: 0 additions & 4 deletions charts/datadog/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -313,10 +313,6 @@ datadog:
# datadog.kubelet.coreCheckEnabled -- Toggle if kubelet core check should be used instead of Python check. (Requires Agent/Cluster Agent 7.53.0+)
# @default -- true
coreCheckEnabled: true
# datadog.kubelet.podResourcesSocketDir -- Path (on host) where the kubelet.sock socket for the PodResources API is located
# @default -- /var/lib/kubelet/pod-resources
podResourcesSocketDir: /var/lib/kubelet/pod-resources


# 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
expvarPort: 6000
Expand Down

0 comments on commit 645031f

Please sign in to comment.