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: fix bug for --cri-socket flag processing logic #79498

Merged
merged 1 commit into from Jul 1, 2019

Conversation

@SataQiu
Copy link
Member

commented Jun 28, 2019

What type of PR is this?
/kind bug

What this PR does / why we need it:
kubeadm: fix bug for --cri-socket flag processing logic

Which issue(s) this PR fixes:

Fixes kubernetes/kubeadm#1640
Ref: kubernetes/kubeadm#1639

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

kubeadm: fix the bug that "--cri-socket" flag does not work for `kubeadm reset`
@SataQiu

This comment has been minimized.

Copy link
Member Author

commented Jun 28, 2019

@k8s-ci-robot k8s-ci-robot requested a review from neolit123 Jun 28, 2019
@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

commented Jun 28, 2019

@SataQiu: GitHub didn't allow me to request PR reviews from the following users: dkoshkin.

Note that only kubernetes members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @neolit123 @rosti @dkoshkin

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 requested a review from rosti Jun 28, 2019
@SataQiu

This comment has been minimized.

Copy link
Member Author

commented Jun 28, 2019

/cc @@bart0sh

Copy link
Member

left a comment

SGTM
/approve
leaving the LGTM to @bart0sh

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

commented Jun 28, 2019

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@neolit123

This comment has been minimized.

Copy link
Member

commented Jun 28, 2019

thanks, @SataQiu
/priority important-longterm
could you please add a release note and cherry pick for 1.15 (once this is merged)?

@SataQiu

This comment has been minimized.

Copy link
Member Author

commented Jun 28, 2019

@neolit123 OK. I will do it!

@SataQiu

This comment has been minimized.

Copy link
Member Author

commented Jun 28, 2019

/test pull-kubernetes-integration
/test pull-kubernetes-e2e-gce-device-plugin-gpu

@BenTheElder

This comment has been minimized.

Copy link
Member

commented Jun 28, 2019

Perhaps the release note should clarify that this is fixing kubeadm reset specifically?

@SataQiu

This comment has been minimized.

Copy link
Member Author

commented Jun 28, 2019

Thanks! @BenTheElder Good catch!
I have modified the release node. Is it OK?

@BenTheElder

This comment has been minimized.

Copy link
Member

commented Jun 28, 2019

Looks good to me! Thanks!

@dkoshkin

This comment has been minimized.

Copy link
Contributor

commented Jun 28, 2019

Thanks for the quick fix @SataQiu !

@SataQiu

This comment has been minimized.

Copy link
Member Author

commented Jun 29, 2019

/assign @bart0sh

Copy link
Member

left a comment

Thanks @SataQiu !
We'll have to cherry pick it in 1.15.
/lgtm

@SataQiu

This comment has been minimized.

Copy link
Member Author

commented Jul 1, 2019

Thanks @rosti
I will do it after this merged!

@k8s-ci-robot k8s-ci-robot merged commit 7db459a into kubernetes:master Jul 1, 2019
23 checks passed
23 checks passed
cla/linuxfoundation SataQiu authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-conformance-image-test Skipped.
pull-kubernetes-cross Skipped.
pull-kubernetes-dependencies Job succeeded.
Details
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-100-performance Job succeeded.
Details
pull-kubernetes-e2e-gce-csi-serial Skipped.
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-gce-iscsi Skipped.
pull-kubernetes-e2e-gce-iscsi-serial Skipped.
pull-kubernetes-e2e-gce-storage-slow Skipped.
pull-kubernetes-godeps Skipped.
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce-big Job succeeded.
Details
pull-kubernetes-local-e2e Skipped.
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-node-e2e-containerd Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details
pull-publishing-bot-validate Skipped.
tide In merge pool.
Details
k8s-ci-robot added a commit that referenced this pull request Jul 4, 2019
…8-up-release-1.15

Automated cherry pick of #79498: kubeadm: fix bug for --cri-socket flag processing logic
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.