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

Jump to bottom

Add support for SBOMs on CRI-O #1662

Merged
merged 2 commits into from
Jan 27, 2025
Merged

Add support for SBOMs on CRI-O #1662

merged 2 commits into from
Jan 27, 2025

Conversation

lebauce
Copy link
Contributor

@lebauce lebauce commented Jan 8, 2025

What this PR does / why we need it:

Which issue this PR fixes

(optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged)

  • fixes #

Special notes for your reviewer:

Checklist

[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]

  • Chart Version bumped
  • Documentation has been updated with helm-docs (run: .github/helm-docs.sh)
  • CHANGELOG.md has been updated
  • Variables are documented in the README.md
  • For Datadog Operator chart or value changes update the test baselines (run: make update-test-baselines)

@lebauce lebauce requested a review from a team as a code owner January 8, 2025 15:13
@github-actions github-actions bot added the chart/datadog This issue or pull request is related to the datadog chart label Jan 8, 2025
@lebauce lebauce force-pushed the lebauce/crio-sbom-support branch 2 times, most recently from 633cf0c to 2b0af59 Compare January 9, 2025 14:07
@lebauce
Copy link
Contributor Author

lebauce commented Jan 9, 2025

/merge

@dd-devflow
Copy link

dd-devflow bot commented Jan 9, 2025 •
edited
Loading

Devflow running: /merge

View all feedbacks in Devflow UI.

2025-01-09 18:22:28 UTC ℹ️ MergeQueue: pull request added to the queue

The median merge time in main is 38m.

2025-01-09 18:58:31 UTC 🚨 MergeQueue: This merge request is in error

mergequeue build completed successfully, but the github api returned an error while merging the pr.
It's probably because:

  • target branch of PR is restricted to only allow up-to-date branches, but the pr is now outdated
Details

Error: PUT https://api.github.com/repos/DataDog/helm-charts/pulls/1662/merge: 405 Required status check "pr-validated" is expected. []

FullStacktrace:
activity error (type: github.GithubService_MergePullRequest, scheduledEventID: 41, startedEventID: 42, identity: 1@github-worker-5c8c586678-xr6bk@): PUT https://api.github.com/repos/DataDog/helm-charts/pulls/1662/merge: 405 Required status check "pr-validated" is expected. [] (type: GitFailure, retryable: false): PUT https://api.github.com/repos/DataDog/helm-charts/pulls/1662/merge: 405 Required status check "pr-validated" is expected. [] (type: ErrorResponse, retryable: true)

clamoriniere
clamoriniere reviewed Jan 9, 2025
View reviewed changes
charts/datadog/templates/_daemonset-volumes-linux.yaml
Comment on lines +163 to +165
- hostPath:
path: /var/lib/containers
name: host-crio-dir
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 ?

@fanny-jiang fanny-jiang self-requested a review January 9, 2025 23:11
@fanny-jiang fanny-jiang force-pushed the lebauce/crio-sbom-support branch 2 times, most recently from 53e5c7e to 2b0af59 Compare January 9, 2025 23:31
@lebauce lebauce force-pushed the lebauce/crio-sbom-support branch from 2b0af59 to 50783c9 Compare January 24, 2025 11:03
@lebauce
Copy link
Contributor Author

lebauce commented Jan 27, 2025

/merge

@dd-devflow
Copy link

dd-devflow bot commented Jan 27, 2025 •
edited
Loading

Devflow running: /merge

View all feedbacks in Devflow UI.

2025-01-27 08:55:31 UTC ℹ️ MergeQueue: pull request added to the queue

The median merge time in main is 37m.

2025-01-27 09:43:19 UTC ℹ️ MergeQueue: This merge request was merged

@lebauce
Copy link
Contributor Author

lebauce commented Jan 27, 2025

@fanny-jiang Now that #1666 is merged, can we merge this one ?

@dd-mergequeue dd-mergequeue bot merged commit 5314de1 into main Jan 27, 2025
29 checks passed
@dd-mergequeue dd-mergequeue bot deleted the lebauce/crio-sbom-support branch January 27, 2025 09:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@clamoriniere clamoriniere clamoriniere left review comments

@Bit-Doctor Bit-Doctor Bit-Doctor approved these changes

@fanny-jiang fanny-jiang fanny-jiang approved these changes

@levan-m levan-m levan-m approved these changes

Assignees
No one assigned
Labels
chart/datadog This issue or pull request is related to the datadog chart mergequeue-status: done
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@lebauce @clamoriniere @Bit-Doctor @fanny-jiang @levan-m