Skip to content

Conversation

viktor-kurchenko
Copy link
Contributor

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

tskinn and others added 2 commits June 4, 2024 18:40
[ upstream commit b6dd0f4 ]

Signed-off-by: Taylor <tskinn12@gmail.com>
Signed-off-by: viktor-kurchenko <viktor.kurchenko@isovalent.com>
[ 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>
@viktor-kurchenko viktor-kurchenko added kind/backports This PR provides functionality previously merged into master. backport/1.15 This PR represents a backport for Cilium 1.15.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:41
@viktor-kurchenko viktor-kurchenko force-pushed the pr/v1.15-backport-2024-06-04-06-40 branch from 1cac930 to dd4c3dd Compare June 4, 2024 15:57
@viktor-kurchenko viktor-kurchenko marked this pull request as ready for review June 4, 2024 16:15
@viktor-kurchenko viktor-kurchenko requested review from a team as code owners June 4, 2024 16:15
@viktor-kurchenko
Copy link
Contributor Author

/test-backport-1.15

@viktor-kurchenko viktor-kurchenko force-pushed the pr/v1.15-backport-2024-06-04-06-40 branch from dd4c3dd to efd4faa Compare June 5, 2024 07:21
@viktor-kurchenko
Copy link
Contributor Author

/test-backport-1.15

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!

Copy link
Member

@qmonnet qmonnet left a comment

Choose a reason for hiding this comment

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

Commit 0dcd53f in this PR has the same commit title and description as 686876c, including the upstream commit reference and backporter notes, although the contents are distinct. Please take a look. Maybe the two commits need to be squashed together? I see the original PR had just one commit.

dswaffordcw and others added 3 commits June 5, 2024 16:45
[ upstream commit 686876c ]
[
  backporter notes:
  * added missing import for sets dependency in the route_policy.go
  * removed wellKnownCommunity variable in the route_policy_test.go
]

In 27322f3, the CiliumLoadBalancerIPPool's field named "cidrs" was deprecated.  The documentation on https://docs.cilium.io/en/stable/network/lb-ipam/ provides an example of configuring a CiliumLoadBalancerIPPool using the field named "blocks".  While testing a BGP policy configured with the Advertised Path Attributes feature, I was not able to achieve the desired policy.  BGP attributes configured were not being applied.

While discussing this in Cilium's Slack channel, it was pointed out that the BGPv1 reconciler was only aware of the deprecated field.

This commit updates Cilium's BGPv1 reconciler to support both the deprecated and updated fields.

Fixes: #32693

Signed-off-by: David Swafford <dswafford@coreweave.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 force-pushed the pr/v1.15-backport-2024-06-04-06-40 branch from efd4faa to 545379c Compare June 5, 2024 13:45
Copy link
Member

@qmonnet qmonnet left a comment

Choose a reason for hiding this comment

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

Thanks!

@qmonnet
Copy link
Member

qmonnet commented Jun 5, 2024

/test-backport-1.15

@viktor-kurchenko
Copy link
Contributor Author

Thanks!

Thank you very much @qmonnet !

@nbusseneau nbusseneau merged commit 95178c6 into v1.15 Jun 5, 2024
@nbusseneau nbusseneau deleted the pr/v1.15-backport-2024-06-04-06-40 branch June 5, 2024 15:37
@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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.15 This PR represents a backport for Cilium 1.15.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.

9 participants