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

Automated cherry pick of #118499: kube-proxy avoid race condition using LocalModeNodeCIDR #118515

Merged
merged 1 commit into from Jun 7, 2023
Merged

Automated cherry pick of #118499: kube-proxy avoid race condition using LocalModeNodeCIDR #118515

merged 1 commit into from Jun 7, 2023

Conversation

aojea
Copy link
Member

@aojea aojea commented Jun 6, 2023 •
edited

Cherry pick of #118499 on release-1.27.

#118499: kube-proxy avoid race condition using LocalModeNodeCIDR

For details on the cherry pick process, see the cherry pick requests page.

NONE

@k8s-ci-robot k8s-ci-robot added this to the v1.27 milestone Jun 6, 2023
@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jun 6, 2023
@k8s-ci-robot
Copy link
Contributor

This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. sig/network Categorizes an issue or PR as relevant to SIG Network. approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jun 6, 2023
@aojea aojea force-pushed the automated-cherry-pick-of-#118499-upstream-release-1.27 branch from fd51f5c to bf911d0 Compare June 6, 2023 19:57
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 6, 2023
@aojea aojea force-pushed the automated-cherry-pick-of-#118499-upstream-release-1.27 branch from bf911d0 to 456f635 Compare June 6, 2023 20:01
@aojea
Copy link
Member Author

aojea commented Jun 6, 2023

/assign @danwinship @thockin

you don't realize how good was latest Dan refactor until you find out you can not add a simple unit test 🙃

@aojea
Copy link
Member Author

aojea commented Jun 6, 2023

/kind bug

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Jun 6, 2023
This was referenced Jun 6, 2023
Merged
Merged
Merged
@aojea
kube-proxy avoid race condition using LocalModeNodeCIDR
b30e94b 
Since kube-proxy in LocalModeNodeCIDR needs to obtain the PodCIDR
assigned to the node it watches for the Node object.

However, kube-proxy startup process requires to have these watches in
different places, that opens the possibility of having a race condition
if the same node is recreated and a different PodCIDR is assigned.

Initializing the second watch with the value obtained in the first one
allows us to detect this situation.

Change-Id: I6adeedb6914ad2afd3e0694dcab619c2a66135f8
Signed-off-by: Antonio Ojea <aojea@google.com>
@aojea aojea force-pushed the automated-cherry-pick-of-#118499-upstream-release-1.27 branch from 456f635 to b30e94b Compare June 6, 2023 21:11
@k8s-ci-robot k8s-ci-robot added the release-note-none Denotes a PR that doesn't merit a release note. label Jun 6, 2023
@thockin
Copy link
Member

thockin commented Jun 6, 2023

Thanks!

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 6, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: e1d57212e36ff964fcbf6bafd457445cf9a4e7c4

@aojea
Copy link
Member Author

aojea commented Jun 7, 2023

/retest

k8s.io/kubernetes/vendor/k8s.io/legacy-cloud-providers/azure: TestConcurrentLockEntry expand_less	0s
{Failed  === RUN   TestConcurrentLockEntry
panic: test timed out after 3m0s
running tests:
	TestConcurrentLockEntry (1s)

It looks like a deadlock

@aojea aojea mentioned this pull request Jun 7, 2023
Open
@aojea
Copy link
Member Author

aojea commented Jun 7, 2023

@kubernetes/release-managers

@saschagrunert saschagrunert added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Jun 7, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aojea, saschagrunert, thockin

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

k8s-ci-robot added a commit that referenced this pull request Jun 7, 2023
@k8s-ci-robot
Merge pull request #118518 from aojea/automated-cherry-pick-of-#11851…
bb57a51 
…5-upstream-release-1.24

Automated cherry pick of #118515: kube-proxy avoid race condition using LocalModeNodeCIDR
@k8s-ci-robot k8s-ci-robot merged commit e2cc1a3 into kubernetes:release-1.27 Jun 7, 2023
14 checks passed
k8s-ci-robot added a commit that referenced this pull request Jun 7, 2023
@k8s-ci-robot
Merge pull request #118516 from aojea/automated-cherry-pick-of-#11851…
202d283 
…5-upstream-release-1.26

Automated cherry pick of #118515: kube-proxy avoid race condition using LocalModeNodeCIDR
k8s-ci-robot added a commit that referenced this pull request Jun 7, 2023
@k8s-ci-robot
Merge pull request #118517 from aojea/automated-cherry-pick-of-#11851…
124dab1 
…5-upstream-release-1.25

Automated cherry pick of #118515: kube-proxy avoid race condition using LocalModeNodeCIDR
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saschagrunert saschagrunert saschagrunert approved these changes

@khenidak khenidak Awaiting requested review from khenidak

@MrHohn MrHohn Awaiting requested review from MrHohn

Assignees

@danwinship danwinship

@thockin thockin

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. release-note-none Denotes a PR that doesn't merit a release note. sig/network Categorizes an issue or PR as relevant to SIG Network. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.27
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@aojea @k8s-ci-robot @thockin @saschagrunert @danwinship