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: rename cri-socket-path -> cri-socket #66382

Merged
merged 1 commit into from
Jul 24, 2018
Merged

kubeadm: rename cri-socket-path -> cri-socket #66382

merged 1 commit into from
Jul 24, 2018

Conversation

bart0sh
Copy link
Contributor

@bart0sh bart0sh commented Jul 19, 2018 •
edited
Loading

What this PR does / why we need it:

Renamed command line option cri-socket-path for 2 reasons:

  • to be consistent with the rest of kubeadm code
    reset/init/join/apply subcommands use --cri-socket
  • name is misleading as CRI socket can be also an url, not just a path

Release note:

renamed command line option  --cri-socket-path of the kubeadm subcommand "kubeadm config images pull" to --cri-socket to be consistent with the rest of kubeadm subcommands.

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. 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. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 19, 2018
@k8s-ci-robot k8s-ci-robot added area/kubeadm sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. labels Jul 19, 2018
@bart0sh
Copy link
Contributor Author

bart0sh commented Jul 19, 2018

/assign kad

@bart0sh bart0sh force-pushed the PR0023-kubeadm-config-rename-cri-socket-path branch from c9d2324 to c401b2f Compare July 19, 2018 13:33
@neolit123
Copy link
Member

neolit123 commented Jul 19, 2018 •
edited
Loading

the rename seems valid.
/ok-to-test

@kubernetes/sig-cluster-lifecycle-pr-reviews
should we apply the deprecation policy for this one? (edit)

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 19, 2018
@kad
Copy link
Member

kad commented Jul 19, 2018

This change would need to have a release note.

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Jul 20, 2018
@bart0sh
Copy link
Contributor Author

bart0sh commented Jul 20, 2018

@kad

This change would need to have a release note.

done

luxas
luxas reviewed Jul 20, 2018
View reviewed changes
Copy link
Member

@luxas luxas left a comment

Choose a reason for hiding this comment

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

This is in itself ok, but we need backwards compat as the kubeadm CLI is beta.
Register both versions of the flag, with the old flag marked as deprecated. The new flag should have higher priority.

timothysc
timothysc approved these changes Jul 20, 2018
View reviewed changes
Copy link
Member

@timothysc timothysc left a comment

Choose a reason for hiding this comment

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

/approve

You need to ensure backward compatibility, after that lgtm.

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 20, 2018
@bart0sh bart0sh force-pushed the PR0023-kubeadm-config-rename-cri-socket-path branch from c401b2f to ed4c32c Compare July 23, 2018 08:53
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 23, 2018
@bart0sh
kubeadm: rename cri-socket-path -> cri-socket
b900664 
Renamed command line option cri-socket-path for 2 reasons:
- to be consistent with the rest of kubeadm code
  reset/init/join/apply subcommands use --cri-socket
- name is misleading as CRI socket can be also an url,
  not just a path
@bart0sh bart0sh force-pushed the PR0023-kubeadm-config-rename-cri-socket-path branch from ed4c32c to b900664 Compare July 23, 2018 08:55
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 23, 2018
@bart0sh
Copy link
Contributor Author

bart0sh commented Jul 23, 2018

done, pleaser review&lgtm

luxas
luxas reviewed Jul 23, 2018
View reviewed changes
Copy link
Member

@luxas luxas left a comment

Choose a reason for hiding this comment

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

idk what flag would have priority if both options were specified now (hypothetically), but this looks good to me.
e.g. @chuckha or @timothysc can do the final /lgtm

timothysc
timothysc approved these changes Jul 23, 2018
View reviewed changes
Copy link
Member

@timothysc timothysc 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 Jul 23, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bart0sh, timothysc

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-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 66296, 66382). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit c6e91c1 into kubernetes:master Jul 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@luxas luxas luxas left review comments

@timothysc timothysc timothysc approved these changes

@dixudx dixudx Awaiting requested review from dixudx

@stealthybox stealthybox Awaiting requested review from stealthybox

Assignees

@kad kad

@timothysc timothysc

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. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@bart0sh @neolit123 @kad @k8s-ci-robot @k8s-github-robot @timothysc @luxas