Skip to content

Conversation

viktor-kurchenko
Copy link
Contributor

@viktor-kurchenko viktor-kurchenko commented Jun 4, 2024

marseel and others added 3 commits June 4, 2024 18:36
[ upstream commit 7209275 ]

Whenever EKS stopped supporting a particular version of EKS, we had to
manually remove it from all stable branches. Now instead of that, we
will dynamically check if it's supported and only then run the test.

This implementation is not great as supported versions are hard-coded in
eksctl until EKS fixes it: aws/containers-roadmap#982 (comment)
Because of that, we always fetch newest eksctl version.

Signed-off-by: Marcel Zieba <marcel.zieba@isovalent.com>
Signed-off-by: viktor-kurchenko <viktor.kurchenko@isovalent.com>
[ upstream commit 4b81d22 ]

Signed-off-by: Lukas Stehlik <stehlik.lukas@gmail.com>
Signed-off-by: viktor-kurchenko <viktor.kurchenko@isovalent.com>
[ upstream commit deee47c ]

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>
Signed-off-by: viktor-kurchenko <viktor.kurchenko@isovalent.com>
@viktor-kurchenko viktor-kurchenko added kind/backports This PR provides functionality previously merged into master. backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. labels Jun 4, 2024
@viktor-kurchenko viktor-kurchenko requested review from marseel and aanm June 4, 2024 15:39
@viktor-kurchenko
Copy link
Contributor Author

/test

@viktor-kurchenko viktor-kurchenko marked this pull request as ready for review June 4, 2024 15:58
@viktor-kurchenko viktor-kurchenko requested review from a team as code owners June 4, 2024 15:58
@viktor-kurchenko viktor-kurchenko requested a review from nebril June 4, 2024 15:58
@viktor-kurchenko
Copy link
Contributor Author

/test-backport-1.14

Copy link
Contributor

@marseel marseel left a comment

Choose a reason for hiding this comment

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

Thanks!

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jun 5, 2024
@qmonnet qmonnet merged commit 9e15fd5 into v1.14 Jun 5, 2024
@qmonnet qmonnet deleted the pr/v1.14-backport-2024-06-04-06-36 branch June 5, 2024 09:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
No open projects
Status: Released
Development

Successfully merging this pull request may close these issues.

6 participants