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.13 Backports 2023-04-17 #24929

Merged
merged 2 commits into from
Apr 17, 2023
Merged

Conversation

aanm
Copy link
Member

@aanm aanm commented Apr 17, 2023

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

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

or with

make add-labels BRANCH=v1.13 ISSUES=24241,24928

[ upstream commit 74307f1 ]

This removes the behavior of mutating the objects received from the
client-go library. To begin with there isn't really any benefit from
doing so, given we don't store the object afterwards, and it will be
ready for gc when it leaves the scope inside client-go. client-go can
possibly return the same pointer twice here, to trigger eg. both an
object update delta and then a DeletedFinalStateUnknown delta with the
same pointer.

For more info, see the issue 115658 in the kubernetes/kubernetes repo on
github.

Signed-off-by: Odin Ugedal <ougedal@palantir.com>
Signed-off-by: Odin Ugedal <odin@uged.al>
Signed-off-by: André Martins <andre@cilium.io>
@aanm aanm requested a review from a team as a code owner April 17, 2023 16:53
@aanm aanm 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 17, 2023
@aanm
Copy link
Member Author

aanm commented Apr 17, 2023

/test-backport-1.13

Job 'Cilium-PR-K8s-1.24-kernel-5.4' failed:

Click to show.

Test Name

K8sAgentPerNodeConfigTest Correctly computes config overrides

Failure Output

FAIL: Expected

Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.24-kernel-5.4/1791/

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

@aanm aanm added the release-blocker/1.13 This issue will prevent the release of the next version of Cilium. label Apr 17, 2023
@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 Apr 17, 2023
[ upstream commit 0d7406a ]

This removes the behavior of mutating the objects received from the
client-go library. To begin with there isn't really any benefit from
doing so, given we don't store the object afterwards, and it will be
ready for gc when it leaves the scope inside client-go. client-go can
possibly return the same pointer twice here, to trigger eg. both an
object update delta and then a DeletedFinalStateUnknown delta with the
same pointer.

For more info, see the issue 115658 in the kubernetes/kubernetes repo on
github.

Follow-up of: 74307f1 ("Avoid clearing objects in conversion funcs")

Signed-off-by: André Martins <andre@cilium.io>
@aanm
Copy link
Member Author

aanm commented Apr 17, 2023

The CI was green. I just re-pushed to reference the upstream commit SHA in the commit message.

@aanm aanm force-pushed the pr/v1.13-backport-2023-04-17 branch from 2ade371 to 9f1822a Compare April 17, 2023 21:02
@aanm aanm merged commit 624534e into cilium:v1.13 Apr 17, 2023
@aanm aanm deleted the pr/v1.13-backport-2023-04-17 branch April 17, 2023 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. release-blocker/1.13 This issue will prevent the release of the next version of Cilium.
Projects
No open projects
Status: Released
Development

Successfully merging this pull request may close these issues.

None yet

3 participants