Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mount host package manager database when host SBOM is enabled #1259

Merged
merged 3 commits into from
Dec 19, 2023
Merged

Mount host package manager database when host SBOM is enabled #1259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cef97eb
Mount host filesystem when host SBOM is enabled
lebauce Nov 24, 2023
e2a9ccb
Only mount host package manager directories
lebauce Dec 15, 2023
89ba72f
Bump version to 3.49.8
lebauce Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion charts/datadog/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Datadog changelog

## 3.49.8

* Mount host package manager database when host SBOM is enabled.

## 3.49.7

Fix NOTES warning for APM Instrumentation
Expand All @@ -10,7 +14,7 @@ Get rid of the old GODEBUG=x509ignoreCN=0 hack that is not effective anymore in

## 3.49.5

Fix registry selection with GKE Autopilot until new registries are allowed.
* Fix registry selection with GKE Autopilot until new registries are allowed.

## 3.49.4

Expand Down
2 changes: 1 addition & 1 deletion charts/datadog/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: datadog
version: 3.49.7
version: 3.49.8
appVersion: "7"
description: Datadog Agent
keywords:
Expand Down
2 changes: 1 addition & 1 deletion charts/datadog/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Datadog

![Version: 3.49.7](https://img.shields.io/badge/Version-3.49.7-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
![Version: 3.49.8](https://img.shields.io/badge/Version-3.49.8-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
13 changes: 13 additions & 0 deletions charts/datadog/templates/_container-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,8 @@
{{- if .Values.datadog.sbom.host.enabled }}
- name: DD_SBOM_HOST_ENABLED
value: "true"
- name: HOST_ROOT
value: /host
{{- end }}
{{- end }}
{{- include "additional-env-entries" .Values.agents.containers.agent.env | indent 4 }}
Expand Down Expand Up @@ -252,6 +254,17 @@
readOnly: true
{{- end }}
{{- end }}
{{- if .Values.datadog.sbom.host.enabled }}
- name: host-apk-dir
mountPath: /host/var/lib/apk
readOnly: true
- name: host-dpkg-dir
mountPath: /host/var/lib/dpkg
readOnly: true
- name: host-rpm-dir
mountPath: /host/var/lib/rpm
readOnly: true
{{- end }}
{{- end }}
{{- if eq .Values.targetSystem "windows" }}
{{- if or .Values.datadog.logs.enabled .Values.datadog.logsEnabled }}
Expand Down
17 changes: 13 additions & 4 deletions charts/datadog/templates/_daemonset-volumes-linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@
- hostPath:
path: /sys/fs/cgroup
name: cgroups
{{- if and (not .Values.providers.gke.autopilot) (or .Values.datadog.systemProbe.osReleasePath .Values.datadog.osReleasePath) }}
{{- if and (not .Values.providers.gke.autopilot) (or .Values.datadog.systemProbe.osReleasePath .Values.datadog.osReleasePath .Values.datadog.sbom.host.enabled) }}
- hostPath:
path: {{ .Values.datadog.systemProbe.osReleasePath | default .Values.datadog.osReleasePath }}
name: os-release-file
{{- end }}
{{- if eq (include "should-enable-system-probe" .) "true" }}
{{- if .Values.datadog.systemProbe.enableDefaultOsReleasePaths }}
{{- if or (and (eq (include "should-enable-system-probe" .) "true") .Values.datadog.systemProbe.enableDefaultOsReleasePaths) .Values.datadog.sbom.host.enabled }}
- hostPath:
path: /etc/redhat-release
name: etc-redhat-release
Expand All @@ -25,7 +24,6 @@
- hostPath:
path: /etc/lsb-release
name: etc-lsb-release
{{- end }}
{{- end -}}
{{- if eq (include "should-enable-fips" . ) "true" }}
{{ include "linux-container-fips-proxy-cfg-volume" . }}
Expand Down Expand Up @@ -146,6 +144,17 @@
path: /
name: hostroot
{{- end }}
{{- if .Values.datadog.sbom.host.enabled }}
- hostPath:
path: /var/lib/apk
name: host-apk-dir
- hostPath:
path: /var/lib/dpkg
name: host-dpkg-dir
- hostPath:
path: /var/lib/rpm
name: host-rpm-dir
{{- end }}
{{- if eq (include "should-enable-security-agent" .) "true" }}
{{- if .Values.datadog.securityAgent.compliance.enabled }}
- hostPath:
Expand Down
Loading