Skip to content

Conversation

aanm
Copy link
Member

@aanm aanm commented Jun 3, 2024

With the introduction of 57db22b, Syft creates the sbom files under the same directory the image digest files are created. This resulted on image-digest-output.txt file to contain all the SBOMs unexpectedly. Thus, using find, we will make sure that only the files that start with the "image-digests" are used to by copied into the image-digest-output.txt file.

Tested in https://github.com/aanm/cilium/actions/runs/9358191181

Fixes: 57db22b ("Generate SBOMs using Syft instead of bom")

@ferozsalam if the Syft PR was backported to all branches then we will need to add the needs-backport to all branches.

With the introduction of 57db22b, Syft creates the sbom files under
the same directory the image digest files are created. This resulted on
image-digest-output.txt file to contain all the SBOMs unexpectedly.
Thus, using find, we will make sure that only the files that start with
the "image-digests" are used to by copied into the
image-digest-output.txt file.

Tested in https://github.com/aanm/cilium/actions/runs/9358191181

Fixes: 57db22b ("Generate SBOMs using Syft instead of bom")
Signed-off-by: André Martins <andre@cilium.io>
@aanm aanm added the release-note/misc This PR makes changes that have no direct user impact. label Jun 3, 2024
@aanm aanm requested review from ferozsalam and joestringer June 3, 2024 22:41
@aanm aanm requested review from a team as code owners June 3, 2024 22:41
@aanm aanm requested a review from nebril June 3, 2024 22:41
@aanm aanm added release-note/bug This PR fixes an issue in a previous release of Cilium. and removed release-note/misc This PR makes changes that have no direct user impact. labels Jun 3, 2024
@aanm
Copy link
Member Author

aanm commented Jun 3, 2024

/test

@aanm aanm enabled auto-merge June 3, 2024 22:41
@aanm aanm added this pull request to the merge queue Jun 4, 2024
Merged via the queue into cilium:main with commit deee47c Jun 4, 2024
@aanm aanm deleted the pr/fix-digest-release branch June 4, 2024 00:18
@ferozsalam
Copy link
Contributor

Thanks @aanm – I've added the backport labels.

@viktor-kurchenko viktor-kurchenko mentioned this pull request Jun 4, 2024
3 tasks
@viktor-kurchenko viktor-kurchenko mentioned this pull request Jun 4, 2024
3 tasks
@viktor-kurchenko viktor-kurchenko added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 labels Jun 4, 2024
@viktor-kurchenko viktor-kurchenko mentioned this pull request Jun 4, 2024
5 tasks
@viktor-kurchenko viktor-kurchenko added backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. and removed needs-backport/1.15 labels Jun 4, 2024
@github-actions github-actions bot removed the backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. label Jun 5, 2024
@github-actions github-actions bot added backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. and removed backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. backport-pending/1.13 labels Jun 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. release-note/bug This PR fixes an issue in a previous release of Cilium.
Projects
No open projects
Status: Backport done to v1.14
Status: Backport done to v1.15
Status: Released
Status: Released
Status: Released
Development

Successfully merging this pull request may close these issues.

4 participants