Skip to content

Commit

Permalink
Add config variable to toggle using kubelet core check (#1319)
Browse files Browse the repository at this point in the history
* Add config variable to toggle using kubelet core check

* Move kubelet core check env var to agent specific chart

* Use camel case for config variable

* Update helm docs

* Append enabled to core check config
  • Loading branch information
jennchenn authored Apr 30, 2024
1 parent 5868f4d commit fc74ba6
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 2 deletions.
5 changes: 5 additions & 0 deletions charts/datadog/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Datadog changelog

## 3.61.0

* Add `datadog.kubelet.core_check` option to configure whether the kubelet core check should be used
Note: this requires agent/cluster agent version 7.53.0+

## 3.60.0

* Set default `Agent` and `Cluster-Agent` version to `7.53.0`
Expand Down
2 changes: 1 addition & 1 deletion charts/datadog/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: datadog
version: 3.60.0
version: 3.61.0
appVersion: "7"
description: Datadog Agent
keywords:
Expand Down
3 changes: 2 additions & 1 deletion charts/datadog/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Datadog

![Version: 3.60.0](https://img.shields.io/badge/Version-3.60.0-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
![Version: 3.61.0](https://img.shields.io/badge/Version-3.61.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 @@ -730,6 +730,7 @@ helm install <RELEASE_NAME> \
| datadog.kubeStateMetricsEnabled | bool | `false` | If true, deploys the kube-state-metrics deployment |
| datadog.kubeStateMetricsNetworkPolicy.create | bool | `false` | If true, create a NetworkPolicy for kube state metrics |
| datadog.kubelet.agentCAPath | string | /var/run/host-kubelet-ca.crt if hostCAPath else /var/run/secrets/kubernetes.io/serviceaccount/ca.crt | Path (inside Agent containers) where the Kubelet CA certificate is stored |
| datadog.kubelet.coreCheckEnabled | bool | `false` | |
| 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 |
Expand Down
1 change: 1 addition & 0 deletions charts/datadog/ci/kubeconform-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ datadog:
kubelet:
hostCAPath: /foo/bar/cert.ca
agentCAPath: /bar/foo/cert.ca
coreCheckEnabled: true
env:
- name: "DD_KUBELET_TLS_VERIFY"
value: "false"
Expand Down
4 changes: 4 additions & 0 deletions charts/datadog/templates/_container-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,10 @@
value: /host
{{- end }}
{{- end }}
{{- if .Values.datadog.kubelet.coreCheckEnabled }}
- name: DD_KUBELET_CORE_CHECK_ENABLED
value: {{ .Values.datadog.kubelet.coreCheckEnabled | quote }}
{{- end }}
{{- 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
3 changes: 3 additions & 0 deletions charts/datadog/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,9 @@ datadog:
# datadog.kubelet.podLogsPath -- Path (on host) where the PODs logs are located
# @default -- /var/log/pods on Linux, C:\var\log\pods on Windows
podLogsPath:
# datadog.kubelet.coreCheck -- Toggle if kubelet core check should be used instead of Python check. (Requires Agent/Cluster Agent 7.53.0+)
# @default -- false
coreCheckEnabled: false

# 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 fc74ba6

Please sign in to comment.