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.

Sign up for GitHub

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

Jump to bottom

v1.13 Backports 2023-12-07 #29702

Merged
merged 2 commits into from
Dec 14, 2023
Merged

v1.13 Backports 2023-12-07 #29702

merged 2 commits into from
Dec 14, 2023

Conversation

nbusseneau
Copy link
Member

@nbusseneau nbusseneau commented Dec 7, 2023 •
edited
Loading

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

 29623 29653

@nbusseneau nbusseneau added kind/backports This PR provides functionality previously merged into master. backport/1.13 This PR represents a backport for Cilium 1.13.x of a PR that was merged to main. labels Dec 7, 2023
@nbusseneau
Copy link
Member Author

@pchaigno Conflicts were hit while backporting your commits, please check backporter's notes for details :)

@nbusseneau
Copy link
Member Author

nbusseneau commented Dec 7, 2023 •
edited
Loading

/test-backport-1.13

@nbusseneau nbusseneau marked this pull request as ready for review December 7, 2023 15:41
@nbusseneau nbusseneau requested review from a team as code owners December 7, 2023 15:41
brb
brb approved these changes Dec 7, 2023
View reviewed changes
Copy link
Member

@brb brb left a comment

Choose a reason for hiding this comment

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

Thanks!

@brb
Copy link
Member

brb commented Dec 7, 2023

The ci-ipsec-upgrade seems to be failing due to the same reason - #29351. cc @qmonnet

@qmonnet
Copy link
Member

qmonnet commented Dec 7, 2023

The ci-ipsec-upgrade seems to be failing due to the same reason - #29351. cc @qmonnet

Yes for kernels 5.4 and 5.10.

Not for kernel 6.1. The failure is the same as observed for 6.1 on #29703, but it's new to me.

@nbusseneau nbusseneau mentioned this pull request Dec 8, 2023
Open
@nbusseneau
Copy link
Member Author

/test-1.26-net-next

@nbusseneau
Copy link
Member Author

@qmonnet So my assumption is that we're safe to ignore failures in ci-ipsec-upgrade because known failures + it's not marked as required, correct?

@qmonnet qmonnet mentioned this pull request Dec 11, 2023
Merged
3 tasks
@giorio94 giorio94 force-pushed the pr/v1.13-backport-2023-12-07-bis branch from e64ef06 to 840ecf6 Compare December 11, 2023 14:06
@giorio94
Copy link
Member

Bumped the Cilium CLI to the latest version (v0.15.17), as conn-disrupt-dispatch-interval was introduced in v0.15.8.

@giorio94
Copy link
Member

giorio94 commented Dec 11, 2023 •
edited by maintainer-s-little-helper bot
Loading

/test-backport-1.13

Job 'Cilium-PR-K8s-1.18-kernel-4.19' failed:

Click to show.

Test Name

K8sAgentPolicyTest Multi-node policy test with L7 policy using connectivity-check to check datapath

Failure Output

FAIL: connectivity-check pods are not ready after timeout

Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.18-kernel-4.19/293/

If it is a flake and a GitHub issue doesn't already exist to track it, comment /mlh new-flake Cilium-PR-K8s-1.18-kernel-4.19 so I can create one.

Then please upload the Jenkins artifacts to that issue.

@giorio94 giorio94 force-pushed the pr/v1.13-backport-2023-12-07-bis branch from 840ecf6 to ce80cc5 Compare December 12, 2023 07:40
@giorio94
Copy link
Member

Rebased onto the tip of v1.13 to pick 286d113 and fix Travis.

@giorio94
Copy link
Member

/test-backport-1.13

@giorio94
Copy link
Member

IPsec failures are either #29805 or #29351

@giorio94
Copy link
Member

giorio94 commented Dec 12, 2023 •
edited
Loading

/test-1.22-4.19

Hit #29362

@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 Dec 12, 2023
@ldelossa
Copy link
Contributor

@giorio94 just to be clear, this is ready to merge despite failures?

@giorio94
Copy link
Member

@giorio94 just to be clear, this is ready to merge despite failures?

#29351 is a known flake which is being looked into, and the check is not required, so I'd say we are good for that.
#29805 seems introduced by this PR (which adds the CI check, no code changes). I'd like to get @brb opinion here whether we should stand by for the moment.

@giorio94 giorio94 added the dont-merge/discussion A discussion is ongoing and should be resolved before merging, regardless of reviews & tests status. label Dec 13, 2023
@ldelossa ldelossa removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Dec 13, 2023
@giorio94 giorio94 mentioned this pull request Dec 13, 2023
Merged
4 tasks
@brb
Copy link
Member

brb commented Dec 13, 2023

Let's maybe hold off merging this PR until I have investigated the 6.1 failures (will do it until EOD tomorrow).

@giorio94 giorio94 mentioned this pull request Dec 14, 2023
Merged
2 tasks
@brb brb force-pushed the pr/v1.13-backport-2023-12-07-bis branch from ce80cc5 to c8147b4 Compare December 14, 2023 10:50
@brb
Copy link
Member

brb commented Dec 14, 2023

/test-backport-1.13

@brb brb removed the dont-merge/discussion A discussion is ongoing and should be resolved before merging, regardless of reviews & tests status. label Dec 14, 2023
pchaigno and others added 2 commits December 14, 2023 12:35
@pchaigno @brb
workflows: Make the conn-disrupt test more sensitive
8563dc7 
[ upstream commit 13efef3 ]

[ backporter's notes: changes to `tests-clustermesh-upgrade.yaml` and
  `tests-e2e-upgrade.yaml` were ignored as they were depending on
  changes not backported to v1.13. Bumped the Cilium CLI version in
  `conformance-ipsec-e2e` to the latest available (v0.15.17), as
  `conn-disrupt-dispatch-interval` was introduced in v0.15.8. ]

By reducing the interval between two sent packets to 0ms, we are making
the conn-disrupt test more sensitive to drops. That should help us
identify remaining bugs in upgrades, key rotations, etc.

Signed-off-by: Paul Chaignon <paul.chaignon@gmail.com>
Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
@brb
ci-ipsec-upgrade: Add vxlan w/ no EP routes
334c1e4 
[ upstream commit f789474 ]

This is more common configuration than the existing vxlan + EP one.

Signed-off-by: Martynas Pumputis <m@lambda.lt>
Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
@brb brb force-pushed the pr/v1.13-backport-2023-12-07-bis branch from c8147b4 to 334c1e4 Compare December 14, 2023 11:36
@brb
Copy link
Member

brb commented Dec 14, 2023

/test-backport-1.13

@brb brb added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Dec 14, 2023
@aanm aanm merged commit 45690bc into v1.13 Dec 14, 2023
136 of 137 checks passed
@aanm aanm deleted the pr/v1.13-backport-2023-12-07-bis branch December 14, 2023 14:54
@gentoo-root gentoo-root mentioned this pull request Jan 17, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brb brb brb approved these changes

@pchaigno pchaigno pchaigno approved these changes

@ti-mo ti-mo ti-mo approved these changes

Assignees
No one assigned
Labels
backport/1.13 This PR represents a backport for Cilium 1.13.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
cilium v1.13.11
Status: Released
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@nbusseneau @brb @qmonnet @giorio94 @ldelossa @pchaigno @ti-mo @aanm