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-04-12 #24843

Merged
merged 2 commits into from
Apr 13, 2023
Merged

v1.13 Backports 2023-04-12 #24843

merged 2 commits into from
Apr 13, 2023

Conversation

gandro
Copy link
Member

@gandro gandro commented Apr 12, 2023 •
edited

Once this PR is merged, you can update the PR labels via:

for pr in 24788 24815; do contrib/backporting/set-labels.py $pr done 1.13; done

or with

make add-labels BRANCH=v1.13 ISSUES=24788,24815

@gandro gandro requested a review from a team as a code owner April 12, 2023 16:37
@gandro gandro 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 Apr 12, 2023
aditighag
aditighag approved these changes Apr 12, 2023
View reviewed changes
Copy link
Member

@aditighag aditighag left a comment

Choose a reason for hiding this comment

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

Thanks!

jrajahalme and others added 2 commits April 12, 2023 18:48
@jrajahalme @gandro
policy: Do not share same policy for multiple cached selectors
5f2c591 
[ upstream commit af83b0e ]

Do not share the same PerSelectorPolicy object between multiple cached
selectors. This makes sure that when rules are merged only the rules for
the intended selectors are effected.

Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
@aditighag @gandro
pkg/cgroups: Prune excessive debug logging
58638bf 
[ upstream commit 07950b8 ]

Remove the log, as we have a CLI to introspect
internal state.

Reported-by: Paul Chaignon <paul@cilium.io>
Signed-off-by: Aditi Ghag <aditi@cilium.io>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
@gandro gandro force-pushed the pr/v1.13-backport-2023-04-12 branch from 744d7c7 to 58638bf Compare April 12, 2023 16:48
@gandro
Copy link
Member Author

gandro commented Apr 12, 2023 •
edited by maintainer-s-little-helper bot

/test-backport-1.13

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

Click to show.

Test Name

K8sDatapathConfig Host firewall With native routing

Failure Output

FAIL: Error deleting resource /home/jenkins/workspace/Cilium-PR-K8s-1.23-kernel-4.9/src/github.com/cilium/cilium/test/k8s/manifests/host-policies.yaml: Cannot retrieve cilium pod cilium-sb96t policy revision: cannot get the revision

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

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

joestringer
joestringer approved these changes Apr 12, 2023
View reviewed changes
Copy link
Member

@joestringer joestringer left a comment •
edited

Choose a reason for hiding this comment

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

The conflicts here due to internal structure changes is a strong hint to me that the tests are brittle with so much internal details defined inside. But that's a matter for future improvements.

EDIT: I had multiple versions open, this was intended for the v1.12 / #24788 PR.

joestringer
joestringer approved these changes Apr 12, 2023
View reviewed changes
Copy link
Member

@joestringer joestringer left a comment

Choose a reason for hiding this comment

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

This time posting the review on the right PR. LGTM for #24788 .

@gandro gandro removed the request for review from jrajahalme April 13, 2023 08:14
@gandro
Copy link
Member Author

gandro commented Apr 13, 2023

/test-1.23-4.9

@gandro
Copy link
Member Author

gandro commented Apr 13, 2023

Roses are red
CI is green
Reviews are in
Let's merge

@gandro gandro merged commit 1527ad4 into cilium:v1.13 Apr 13, 2023
37 checks passed
@gentoo-root gentoo-root mentioned this pull request Apr 14, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joestringer joestringer joestringer approved these changes

@aditighag aditighag aditighag 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@gandro @joestringer @aditighag @jrajahalme