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

v1.14 Backports 2024-01-16 #30265

Merged
merged 5 commits into from
Jan 17, 2024
Merged

v1.14 Backports 2024-01-16 #30265

merged 5 commits into from
Jan 17, 2024

Conversation

gandro
Copy link
Member

@gandro gandro commented Jan 16, 2024

Once this PR is merged, a GitHub action will update the labels of these PRs:

 29400 30194 28698 28974 30209

meyskens and others added 5 commits January 16, 2024 09:36
[ upstream commit e71407b ]

This change adds a check in the auth manager not to do authentication
for either IDs if they are reserved.
This could have caused failed handshakes to happen should any of these
entities be allowed by policy but with mutual auth enabled.
These IDs do are not able to ever complete a handshake as they are not
generated by design.

This commit also replaces all IDs used in tests to be high enough
that they do not conflict with reserve IDs.

Signed-off-by: Maartje Eyskens <maartje@eyskens.me>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit 680b0d1 ]

Bump the timeout to fix cancelled test runs that have started to pop up
in CI.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit 284b41d ]

This removed level=error errors from the spire-client system in the
operator. As it is expected to fail on initial startup of SPIRE to have
connection issues Cilium will retry.

Some errors also came from the SPIFFE library itself which is why a
wrapper to log them as warnings instead was added.

Signed-off-by: Maartje Eyskens <maartje.eyskens@isovalent.com>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit 9907af3 ]

Fixes: #28158
Signed-off-by: Vipul Singh <singhvipul@microsoft.com>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit a255997 ]

We previously looked up the chaining mode by name, but this is
non-obvious and unnecessary. So, we added the CHI chaining-mode
parameter. But, we failed to update the docs to reference this.

Fixes: #28714

Signed-off-by: Casey Callendrello <cdc@isovalent.com>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
@gandro gandro 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 Jan 16, 2024
@gandro gandro marked this pull request as ready for review January 16, 2024 09:40
@gandro gandro requested review from a team as code owners January 16, 2024 09:40
@gandro gandro requested a review from brlbil January 16, 2024 09:40
@gandro
Copy link
Member Author

gandro commented Jan 16, 2024

/test-backport-1.14

Copy link
Member

@meyskens meyskens left a comment

Choose a reason for hiding this comment

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

LGTM for my changes!

@gandro
Copy link
Member Author

gandro commented Jan 17, 2024

CI is green, remaining reviews are trivial. Merging this to unblock the release.

@gandro gandro merged commit e50463f into v1.14 Jan 17, 2024
210 checks passed
@gandro gandro deleted the pr/v1.14-backport-2024-01-16 branch January 17, 2024 10:28
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.
Projects
No open projects
Status: Released
Development

Successfully merging this pull request may close these issues.

None yet

6 participants