From 63f9175f7ca8867ee9e39fa36ba9ef3e9e454bf2 Mon Sep 17 00:00:00 2001 From: Sylvain Baubeau Date: Thu, 26 Sep 2024 15:49:38 +0200 Subject: [PATCH 1/2] Mount /usr/lib/sysimage/rpm when using host SBOM feature --- charts/datadog/CHANGELOG.md | 4 ++++ charts/datadog/Chart.yaml | 2 +- charts/datadog/README.md | 2 +- charts/datadog/templates/_container-agent.yaml | 3 +++ charts/datadog/templates/_daemonset-volumes-linux.yaml | 3 +++ 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/charts/datadog/CHANGELOG.md b/charts/datadog/CHANGELOG.md index 5841115ad..ceefc0b45 100644 --- a/charts/datadog/CHANGELOG.md +++ b/charts/datadog/CHANGELOG.md @@ -1,5 +1,9 @@ # Datadog changelog +## 3.74.2 + +* Mount /usr/lib/sysimage/rpm when using host SBOM feature. + ## 3.74.1 * Pass components env variables to the cluster checks runner deployment pod spec. diff --git a/charts/datadog/Chart.yaml b/charts/datadog/Chart.yaml index ea5a84191..6e737e242 100644 --- a/charts/datadog/Chart.yaml +++ b/charts/datadog/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: datadog -version: 3.74.1 +version: 3.74.2 appVersion: "7" description: Datadog Agent keywords: diff --git a/charts/datadog/README.md b/charts/datadog/README.md index 4bdf368ea..872ce5ad2 100644 --- a/charts/datadog/README.md +++ b/charts/datadog/README.md @@ -1,6 +1,6 @@ # Datadog -![Version: 3.74.1](https://img.shields.io/badge/Version-3.74.1-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square) +![Version: 3.74.2](https://img.shields.io/badge/Version-3.74.2-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/). diff --git a/charts/datadog/templates/_container-agent.yaml b/charts/datadog/templates/_container-agent.yaml index 90200d49e..6e735be61 100644 --- a/charts/datadog/templates/_container-agent.yaml +++ b/charts/datadog/templates/_container-agent.yaml @@ -291,6 +291,9 @@ - name: host-rpm-dir mountPath: /host/var/lib/rpm readOnly: true + - name: host-sysimage-rpm + mountPath: /host/usr/lib/sysimage/rpm + readOnly: true {{- if ne .Values.datadog.osReleasePath "/etc/redhat-release" }} - name: etc-redhat-release mountPath: /host/etc/redhat-release diff --git a/charts/datadog/templates/_daemonset-volumes-linux.yaml b/charts/datadog/templates/_daemonset-volumes-linux.yaml index 39ce80f63..fdcc72f70 100644 --- a/charts/datadog/templates/_daemonset-volumes-linux.yaml +++ b/charts/datadog/templates/_daemonset-volumes-linux.yaml @@ -162,6 +162,9 @@ - hostPath: path: /var/lib/rpm name: host-rpm-dir +- hostPath: + path: /usr/lib/sysimage/rpm + name: host-sysimage-rpm {{- end }} {{- if eq (include "should-enable-security-agent" .) "true" }} {{- if .Values.datadog.securityAgent.compliance.enabled }} From 9306d703c350e1ee9c148e68238c13d902d137d5 Mon Sep 17 00:00:00 2001 From: Sylvain Baubeau Date: Mon, 14 Oct 2024 14:33:22 +0200 Subject: [PATCH 2/2] Update charts/datadog/CHANGELOG.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Timothée Bavelier <97530782+tbavelier@users.noreply.github.com> --- charts/datadog/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/datadog/CHANGELOG.md b/charts/datadog/CHANGELOG.md index ceefc0b45..ebfa2746b 100644 --- a/charts/datadog/CHANGELOG.md +++ b/charts/datadog/CHANGELOG.md @@ -2,7 +2,7 @@ ## 3.74.2 -* Mount /usr/lib/sysimage/rpm when using host SBOM feature. +* Mount `/usr/lib/sysimage/rpm` in the Agent DaemonSet when using host SBOM feature (required on hosts running Amazon Linux distributions). ## 3.74.1