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.12 Backports 2023-12-07 #29701

Merged
merged 2 commits into from
Dec 14, 2023
Merged

v1.12 Backports 2023-12-07 #29701

merged 2 commits into from
Dec 14, 2023

Conversation

nbusseneau
Copy link
Member

@nbusseneau nbusseneau commented Dec 7, 2023 •
edited

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.12 This PR represents a backport for Cilium 1.12.x of a PR that was merged to main. labels Dec 7, 2023
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!

@nbusseneau nbusseneau force-pushed the pr/v1.12-backport-2023-12-07-bis branch from d5346dd to 4d0991b Compare December 7, 2023 15:25
@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

/test-backport-1.12

@nbusseneau nbusseneau marked this pull request as ready for review December 7, 2023 15:40
@nbusseneau nbusseneau requested review from a team as code owners December 7, 2023 15:40
@nbusseneau
Copy link
Member Author

nbusseneau commented Dec 7, 2023 •
edited

https://github.com/cilium/cilium/actions/runs/7130488093/job/19416964192
=> unknown flag: --conn-disrupt-dispatch-interval 🤔

I suspect the conn-disrupt changes actually depend on something else that's missing. It's probably the CLI version.

@nbusseneau
Copy link
Member Author

/test-1.22-4.9

@giorio94 giorio94 force-pushed the pr/v1.12-backport-2023-12-07-bis branch from 4d0991b to 122937f Compare December 11, 2023 14:00
@giorio94
Copy link
Member

/test-backport-1.12

@giorio94
Copy link
Member

giorio94 commented Dec 11, 2023 •
edited

https://github.com/cilium/cilium/actions/runs/7130488093/job/19416964192 => unknown flag: --conn-disrupt-dispatch-interval 🤔

I suspect the conn-disrupt changes actually depend on something else that's missing. It's probably the CLI version.

Bumped the Cilium CLI to the latest version (v0.15.17), which should fix the issue.

@giorio94 giorio94 mentioned this pull request Dec 11, 2023
Closed
@pchaigno @giorio94
workflows: Make the conn-disrupt test more sensitive
2cfe357 
[ 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.12. 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>
@giorio94 giorio94 force-pushed the pr/v1.12-backport-2023-12-07-bis branch from 122937f to 2f60068 Compare December 12, 2023 07:38
@giorio94
Copy link
Member

Rebased onto the tip of v1.12 to pick 0186818 and fix Travis.

@giorio94
Copy link
Member

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

/test-backport-1.12

Job 'Cilium-PR-K8s-1.20-kernel-4.9' failed:

Click to show.

Test Name

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

Failure Output

FAIL: cannot install connectivity-check

Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.20-kernel-4.9/316/

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

Then please upload the Jenkins artifacts to that issue.

@giorio94
Copy link
Member

IPsec failures are #29805

@giorio94
Copy link
Member

giorio94 commented Dec 12, 2023 •
edited

/test-1.20-4.9

Hit #13071

@giorio94
Copy link
Member

giorio94 commented Dec 13, 2023 •
edited

/test-1.20-4.9

Previous run failed during VM provisioning

@giorio94 giorio94 added the dont-merge/discussion A discussion is ongoing and should be resolved before merging, regardless of reviews & tests status. label Dec 14, 2023
@giorio94
Copy link
Member

Marking as blocked while IPSec the new failures in Cilium IPSec upgrade get investigated: #29702 (comment)

@brb
ci-ipsec-upgrade: Add vxlan w/ no EP routes
1380f6d 
[ 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.12-backport-2023-12-07-bis branch from 2f60068 to 1380f6d Compare December 14, 2023 10:51
@brb
Copy link
Member

brb commented Dec 14, 2023

/test-backport-1.12

@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
@aanm aanm merged commit 2524ad9 into v1.12 Dec 14, 2023
107 of 108 checks passed
@aanm aanm deleted the pr/v1.12-backport-2023-12-07-bis branch December 14, 2023 14:55
@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.12 This PR represents a backport for Cilium 1.12.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@nbusseneau @giorio94 @brb @pchaigno @ti-mo @aanm