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

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

Merged
merged 1 commit into from Jul 24, 2018

Conversation

@bart0sh
Copy link
Contributor

bart0sh commented Jul 19, 2018

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.
@bart0sh

This comment has been minimized.

Copy link
Contributor Author

bart0sh commented Jul 19, 2018

/assign kad

@bart0sh bart0sh force-pushed the bart0sh:PR0023-kubeadm-config-rename-cri-socket-path branch from c9d2324 to c401b2f Jul 19, 2018

@neolit123

This comment has been minimized.

Copy link
Member

neolit123 commented Jul 19, 2018

the rename seems valid.
/ok-to-test

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

@kad

This comment has been minimized.

Copy link
Member

kad commented Jul 19, 2018

This change would need to have a release note.

@bart0sh

This comment has been minimized.

Copy link
Contributor Author

bart0sh commented Jul 20, 2018

@kad

This change would need to have a release note.

done

@luxas
Copy link
Member

luxas left a comment

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
Copy link
Member

timothysc left a comment

/approve

You need to ensure backward compatibility, after that lgtm.

@bart0sh bart0sh force-pushed the bart0sh:PR0023-kubeadm-config-rename-cri-socket-path branch from c401b2f to ed4c32c Jul 23, 2018

kubeadm: rename cri-socket-path -> cri-socket
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 bart0sh:PR0023-kubeadm-config-rename-cri-socket-path branch from ed4c32c to b900664 Jul 23, 2018

@k8s-ci-robot k8s-ci-robot added size/XS approved and removed size/XL labels Jul 23, 2018

@bart0sh

This comment has been minimized.

Copy link
Contributor Author

bart0sh commented Jul 23, 2018

done, pleaser review&lgtm

@luxas
Copy link
Member

luxas left a comment

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
Copy link
Member

timothysc left a comment

/lgtm

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Jul 23, 2018

[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

This comment has been minimized.

Copy link
Contributor

k8s-github-robot commented Jul 24, 2018

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

18 checks passed

Submit Queue Queued to run github e2e tests a second time.
Details
cla/linuxfoundation bart0sh authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-cross Skipped
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-100-performance Job succeeded.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-gke Skipped
pull-kubernetes-e2e-kops-aws Job succeeded.
Details
pull-kubernetes-e2e-kubeadm-gce Skipped
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce-big Job succeeded.
Details
pull-kubernetes-local-e2e Skipped
pull-kubernetes-local-e2e-containerized Skipped
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.