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.

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

Add support for SBOMs on CRI-O #1662

Merged
merged 2 commits into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.88.3

* Mount /var/lib/containers to generate SBOMs for CRI-O.

## 3.88.2

* Disable running process check in core Agent by default feature for GKE Autopilot, as it is not supported.
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.88.2
version: 3.88.3
appVersion: "7"
description: Datadog Agent
keywords:
Expand Down
2 changes: 1 addition & 1 deletion charts/datadog/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Datadog

![Version: 3.88.2](https://img.shields.io/badge/Version-3.88.2-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
![Version: 3.88.3](https://img.shields.io/badge/Version-3.88.3-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
3 changes: 3 additions & 0 deletions charts/datadog/templates/_container-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,9 @@
- name: host-docker-dir
mountPath: /host/var/lib/docker
readOnly: true
- name: host-crio-dir
mountPath: /host/var/lib/containers
readOnly: true
{{- end }}
{{- if eq (include "should-enable-sbom-host-fs-collection" .) "true" }}
- name: host-apk-dir
Expand Down
3 changes: 3 additions & 0 deletions charts/datadog/templates/_daemonset-volumes-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,9 @@
- hostPath:
path: /var/lib/docker
name: host-docker-dir
- hostPath:
path: /var/lib/containers
name: host-crio-dir
Comment on lines +163 to +165
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'm wondering this change will not break GKE autopilot

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upon double checking, this change does break GKE autopilot if any of the datadog.sbom.* features enabled.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR should prevent the new hostPath from breaking autopilot: https://github.com/DataDog/helm-charts/pull/1666/files

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upon double checking, this change does break GKE autopilot if any of the datadog.sbom.* features enabled.

This is even without this change, right ?

{{- end }}
{{- if eq (include "should-enable-sbom-host-fs-collection" .) "true" }}
- hostPath:
Expand Down
Loading