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

Revert "fix: handle socket file detection on Windows" #126976

Merged
merged 1 commit into from
Sep 3, 2024

Conversation

jsturtevant
Copy link
Contributor

@jsturtevant jsturtevant commented Aug 28, 2024

This reverts commit 4060ee6.

What type of PR is this?

/kind bug
/kind regression

What this PR does / why we need it:

It looks like fix in golang for golang/go#33357 isn't working properly.

Which issue(s) this PR fixes:

Fixes #126965

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Fixes a 1.31 regression starting kubelet on Windows: Revert "fix: handle socket file detection on Windows"

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

NONE

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. kind/regression Categorizes issue or PR as related to a regression from a prior release. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. 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. area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Aug 28, 2024
@k8s-ci-robot k8s-ci-robot requested review from dims and klueska August 28, 2024 17:40
@jsturtevant
Copy link
Contributor Author

/assign @marosset @kannon92

fyi @fakecore

@marosset
Copy link
Contributor

/lgtm

Should we add a test to make sure we don't accidently regress this in the future?

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

LGTM label has been added.

Git tree hash: 4f1cc94500bc6d8cb5cb3161fa834abac57aa31b

@kannon92
Copy link
Contributor

/priority critical

@k8s-ci-robot
Copy link
Contributor

@kannon92: The label(s) priority/critical cannot be applied, because the repository doesn't have them.

In response to this:

/priority critical

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-sigs/prow repository.

@ffromani
Copy link
Contributor

/triage accepted
/priority critical-urgent

I think this will be backported to 1.31, right?

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. and removed 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. labels Aug 28, 2024
@ffromani
Copy link
Contributor

/lgtm

Should we add a test to make sure we don't accidently regress this in the future?

yes. We do have already device manager tests though, and some of them do cause a kubelet restart (which leads to flakes, but that's another story for another day). It should be sufficient to make sure these tests run on windows lane(s).

@jsturtevant
Copy link
Contributor Author

I can take a look at what it would take to enable those tests, I don't believe we currently run them in anyway.

@jsturtevant
Copy link
Contributor Author

jsturtevant commented Aug 28, 2024

It looks like these are the tests https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/device_manager_test.go?

Unfortunately, we don't currently have ability to run e2e_node tests on Windows. It might be something that could be enabled but not in a timely fashion, mostly since api-server isn't built/run on windows, so I don't know what the effort would be to enable that. etcd currently produces windows builds but they are no longer running ci against it

I can add a test into e2e test suite, that will restart kubelet which will cover more than just device manager scenarios.

@randomvariable
Copy link
Member

Can confirm the reboot test would catch this

@jsturtevant
Copy link
Contributor Author

/test pull-kubernetes-e2e-capz-windows-serial-slow
I've added the reboot test into this job. I tested it locally with and without the branch and it does confirm rolling this back works.

@jsturtevant
Copy link
Contributor Author

Test passed!

Kubernetes e2e suite: [It] [sig-windows] [Feature:Windows] [Excluded:WindowsDocker] [MinimumKubeletVersion:1.22] RebootHost containers [Serial] [Disruptive] [Slow] should run as a reboot process on the host/node

/assign @kannon92 @ffromani

@jsturtevant
Copy link
Contributor Author

/assign @marosset

@kannon92
Copy link
Contributor

@jsturtevant a presubmit is helpful but is there a periodic that would catch this?

Otherwise, this looks good to me.

@jsturtevant
Copy link
Contributor Author

yes, opened kubernetes/test-infra#33395 to enable it after this merges

@ffromani
Copy link
Contributor

/lgtm

the revert looks good. Bummer that we can't run the device manager tests on windows, but it seems we got some coverate thanks to @jsturtevant

@kannon92
Copy link
Contributor

/assign @mrunalp @dchen1107 @derekwaynecarr

@kannon92
Copy link
Contributor

/assign @yujuhong @klueska

@kannon92
Copy link
Contributor

/unassign @mrunalp @derekwaynecarr

@dims
Copy link
Member

dims commented Sep 3, 2024

/approve

this is a priority-critical revert.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dims, jsturtevant

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 k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 3, 2024
@k8s-ci-robot k8s-ci-robot merged commit 14f2cab into kubernetes:master Sep 3, 2024
15 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.32 milestone Sep 3, 2024
@kannon92
Copy link
Contributor

kannon92 commented Sep 3, 2024

@jsturtevant can we get a cherry-pick for this for v1.31?

@tt-kkaiser
Copy link

@jsturtevant This pull request can be reverted, as of pull request #127076 kubernetes uses go 1.23, so the previous code is functional again.

@ffromani
Copy link
Contributor

ffromani commented Sep 4, 2024

@jsturtevant This pull request can be reverted, as of pull request #127076 kubernetes uses go 1.23, so the previous code is functional again.

Thanks for the update!
the process is usually to commit fixes on master branch and then backport, and this is what we need to do to unbreak 1.31. Once that is fixed, we can re-introduce the original fix in a separate PR, perhaps with more tests. I'd do that rather than a re-revert.

k8s-ci-robot added a commit that referenced this pull request Sep 4, 2024
…#126976-upstream-release-1.31

Automated cherry pick of #126976: Revert "fix: handle socket file detection on Windows"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. kind/regression Categorizes issue or PR as related to a regression from a prior release. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/node Categorizes an issue or PR as relevant to SIG Node. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Development

Successfully merging this pull request may close these issues.

kubelet fail to start on Windows since v1.31.0