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

Match on cri-o socket suffix only #118704

Merged
merged 1 commit into from
Oct 17, 2023
Merged

Conversation

dgl
Copy link
Contributor

@dgl dgl commented Jun 16, 2023

This deals with the case that a user can configure cri-o to use /run/crio/crio.sock and get very confusing behavior.

See cri-o/cri-o#7010 (comment)

What type of PR is this?

/kind bug

What this PR does / why we need it:

Updates the path used by the kubelet to decide whether the runtime is CRI-O to also match on /run/crio/crio.sock. This fixes a strange, non-obvious behaviour users may see if they configure a different (but valid) path to CRI-O. See cri-o/cri-o#7010 (comment)

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Update the CRI-O socket path, so users who configure kubelet to use a location like `/run/crio/crio.sock` don't see strange behaviour from CRI stats provider.

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


@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. 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. labels Jun 16, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @dgl. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jun 16, 2023
@dgl
Copy link
Contributor Author

dgl commented Jun 16, 2023

/sig node

@k8s-ci-robot k8s-ci-robot added sig/node Categorizes an issue or PR as relevant to SIG Node. area/kubelet and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jun 16, 2023
@dgl
Copy link
Contributor Author

dgl commented Jun 16, 2023

/assign @haircommander

@haircommander
Copy link
Contributor

this makes sense to me! I think the ultimate aim is to have cri stats provider not be so strange in cri-o, but that needs work that hopefully will happen over this release. in the meantime, this exact path match is really awkward and has always been a sore spot for me.

/lgtm
/ok-to-test
/priority important-soon
/triage accepted

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. triage/accepted Indicates an issue or PR is ready to be actively worked on. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. 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. labels Jun 16, 2023
@bart0sh bart0sh moved this from Triage to Needs Approver in SIG Node PR Triage Jun 16, 2023
@haircommander
Copy link
Contributor

 pkg/kubelet/cadvisor/helpers_linux.go:40:26: undefined: CrioSocket
pkg/kubelet/cadvisor/util.go:74:9: undefined: strings 

some compile errors
/lgtm cancel

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 20, 2023
@haircommander haircommander moved this from Needs Approver to Waiting on Author in SIG Node PR Triage Jun 20, 2023
@bart0sh
Copy link
Contributor

bart0sh commented Aug 3, 2023

/retest

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 30, 2023
@dgl
Copy link
Contributor Author

dgl commented Aug 31, 2023

/retest

@dgl
Copy link
Contributor Author

dgl commented Sep 1, 2023

/retest

This deals with the case that a user can configure cri-o to use
/run/crio/crio.sock and get very confusing behavior.

See cri-o/cri-o#7010 (comment)
@dgl
Copy link
Contributor Author

dgl commented Sep 4, 2023

/retest

@dgl
Copy link
Contributor Author

dgl commented Sep 5, 2023

@haircommander sorry about the delay on this, was on leave, now ready for review (and apparently goimports wasn't setup properly, I've now fixed my setup...)

@haircommander
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 5, 2023
@haircommander haircommander moved this from Waiting on Author to Needs Approver in SIG Node PR Triage Sep 5, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: cb69a24a8d2da5f515135bc327d5f295db43f527

@kannon92
Copy link
Contributor

/assign @mrunalp

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dgl, mrunalp

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 Oct 17, 2023
@k8s-ci-robot k8s-ci-robot merged commit 3d77b95 into kubernetes:master Oct 17, 2023
14 checks passed
SIG Node PR Triage automation moved this from Needs Approver to Done Oct 17, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.29 milestone Oct 17, 2023
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. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. 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/S Denotes a PR that changes 10-29 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

6 participants