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

kubeadm: remove temporary handling of CRI socket paths without URL scheme #109356

Merged
merged 1 commit into from May 18, 2022
Merged

kubeadm: remove temporary handling of CRI socket paths without URL scheme #109356

merged 1 commit into from May 18, 2022

Conversation

pacoxu
Copy link
Member

@pacoxu pacoxu commented Apr 7, 2022 •
edited by k8s-ci-robot

/kind cleanup
refer to kubernetes/kubeadm#2426
follow up of #107295

NONE

kubernetes/cmd/kubeadm/app/util/config/initconfiguration.go

Lines 120 to 122 in 2118440

klog.Warningf("Usage of CRI endpoints without URL scheme is deprecated and can cause kubelet errors "+
"in the future. Automatically prepending scheme %q to the \"criSocket\" with value %q. "+
"Please update your configuration!", kubeadmapiv1.DefaultContainerRuntimeURLScheme, cfg.CRISocket)

The warning should change to an error in the future（maybe 1.26）

@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/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/M Denotes a PR that changes 30-99 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. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Apr 7, 2022
@k8s-ci-robot k8s-ci-robot added area/kubeadm sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Apr 7, 2022
@neolit123 neolit123 mentioned this pull request Apr 7, 2022
Closed
4 tasks
@neolit123
Copy link
Member

thanks @pacoxu
/triage accepted
/approve

will double check it again before 1.25 opens for PRs.
added this PR here:
kubernetes/kubeadm#2426

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Apr 7, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: neolit123, pacoxu

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 Apr 7, 2022
@neolit123
Copy link
Member

i think ...maybe we can go without release note for this one, actually.
that's because we are just removing code that was temporary in there.

/release-note-edit

NONE

/retitle kubeadm: remove temporary handling of CRI socket paths without URL scheme

@k8s-ci-robot k8s-ci-robot changed the title CRI socket paths should have URL scheme kubeadm: remove temporary handling of CRI socket paths without URL scheme Apr 7, 2022
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Apr 7, 2022
@neolit123
Copy link
Member

for 1.25 (as part of this PR) we can also add URL scheme check in the e2e test:
https://github.com/kubernetes/kubernetes/blob/master/test/e2e_kubeadm/nodes_test.go#L39-L57

it should be fine version skew wise - i.e. kubeadm 1.25 being tested with 1.24 k8s e2e test suite 🤔

@pacoxu
Copy link
Member Author

pacoxu commented May 5, 2022

/retest

@neolit123
Copy link
Member

LGTM, will double check early next week.

@neolit123
Copy link
Member

/priority important-soon

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels May 12, 2022
neolit123
neolit123 reviewed May 17, 2022
View reviewed changes
cmd/kubeadm/app/phases/upgrade/postupgrade.go
Comment on lines -72 to -77
// TODO: Temporary workaround. Remove in 1.25:
// https://github.com/kubernetes/kubeadm/issues/2426
if err := UpdateKubeletDynamicEnvFileWithURLScheme(dryRun); err != nil {
return err
}

Copy link
Member

Choose a reason for hiding this comment

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

note for the future.

we might want to use a similar function for other mutations in the dynamic env file.
e.g. when we have to do some cleanups of the deprecated kubelet flags such as --container-runtime=remote
kubernetes/kubeadm#2626
#106893

neolit123
neolit123 reviewed May 17, 2022
View reviewed changes
Copy link
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 17, 2022
@k8s-ci-robot k8s-ci-robot merged commit 90d7400 into kubernetes:master May 18, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.25 milestone May 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neolit123 neolit123 neolit123 left review comments

@SataQiu SataQiu Awaiting requested review from SataQiu

Assignees

@neolit123 neolit123

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubeadm cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.25
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@pacoxu @neolit123 @k8s-ci-robot