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.15 Backports 2024-01-16 #30264

Merged
merged 6 commits into from
Jan 16, 2024
Merged

v1.15 Backports 2024-01-16 #30264

merged 6 commits into from
Jan 16, 2024

Conversation

ti-mo and others added 6 commits January 16, 2024 09:24
…tart

[ upstream commit 1275493 ]

The gotcha with Cmd.ProcessState is documented in comments. I'm not sure if
we're really interested in Maxrss of failed compilations, or if it really needs
to be debug-logged.

For troubleshooting something like this, we'd want to reproduce this locally
anyway, at which point we can hack in a few log lines. I didn't want to switch
to a separate Cmd.Start() and Cmd.Wait(), so the maxrss logic was consolidated
into a single block, only executed when compilation was successful, where
Cmd.ProcessState is guaranteed to be set.

Fixes #29989.

Signed-off-by: Timo Beckers <timo@isovalent.com>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit 862fcd5 ]

Compare the entries of 'msA' and 'msB' rather than 'msB' against itself.

Simplify the body of the comparison function for readability.

Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit 501cb42 ]

At some point (v0.15.18), connectivity test "no-missed-tail-calls" was
renamed as "no-unexpected-packet-drops" in cilium-cli [0]. We now use a
cilium-cli version that contain the change, but we've omitted to update
the name of the test to run in the workflow. Let's adjust it now.

[0] cilium/cilium-cli@4880c91a726d ("connectivity: Check for unexpected packet drops")
Fixes: 16fe166 ("gh/workflows: Bump CLI to v0.15.18")
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit 7318ce2 ]

Currently, when multiple `CiliumEnvoyConfig`s reference the same
backend service on different ports, the `frontendPorts` that are
used to filter the backends is always overwritten with the ports of the
last modified CEC.

As a result, not all the Cilium Backends are synchronized to Envoy
as Endpoints. This breaks connectivity.

Therefore, this commit fixes the frontendPorts by using the ports
of all referencing CiliumEnvoyConfigs.

Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit 3381e0f ]

This option was added for a niche use-case that no longer needs
it and the agent did not anymore support it. Remove the
remaining code related to it.

Signed-off-by: Jussi Maki <jussi@isovalent.com>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit 7fc78e9 ]

Add an action to call the workflow that update the labels of backported
PRs in stable branch.

This commit is based on the following commits by Fabio from v1.14 branch:
- 81ade5f ("ci: Call the workflow to update labels of backported PRs")
- a5a047f ("ci: Use pull_request_target in update label workflow")

The primary change here is to list all maintained branches in a single
workflow on main in order to simplify the maintenance burden when
creating new stable branches (eg, during v1.15 stable branch creation).

This action will not trigger from the main branch for PRs targeted to
stable branches. However, when we copy this workflow to stable branches,
it will run for PRs targeted to that stable branch (assuming that the
versions referenced in this file are kept in sync with the branch
version).

Signed-off-by: Fabio Falzoi <fabio.falzoi@isovalent.com>
Co-authored-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
@gandro gandro 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 Jan 16, 2024
@gandro gandro marked this pull request as ready for review January 16, 2024 09:26
@gandro gandro requested review from a team as code owners January 16, 2024 09:26
@gandro gandro requested a review from tklauser January 16, 2024 09:26
@gandro
Copy link
Member Author

gandro commented Jan 16, 2024

/test-backport-1.15

Edit:

  • ci-gingo failed with Invalid value: 31414: provided port is already allocated - restarting

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.

Backport for my commit looks good, thanks Sebastian!

Copy link
Member

@mhofstetter mhofstetter left a comment

Choose a reason for hiding this comment

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

My commit looks good. Thanks!

Copy link
Contributor

@ti-mo ti-mo 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

@aanm aanm left a comment

Choose a reason for hiding this comment

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

I'll merge it since I'm preparing an RC for the v1.15. Thanks for the PR Sebastian!

@aanm aanm merged commit 3a0ea0f into v1.15 Jan 16, 2024
206 checks passed
@aanm aanm deleted the pr/v1.15-backport-2024-01-16 branch January 16, 2024 12:14
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants