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: crictl reset commands fixes #63862

Merged
merged 1 commit into from May 24, 2018

Conversation

@runcom
Copy link
Member

runcom commented May 15, 2018

Signed-off-by: Antonio Murdaca runcom@redhat.com

What this PR does / why we need it:

change container stop/rm commands with sandbox stop/rm to properly reset using kubeadm

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes kubernetes/kubeadm#748

Special notes for your reviewer:

Release note:

Correct the way we reset containers and pods in kubeadm via crictl
@kad

This comment has been minimized.

Copy link
Member

kad commented May 15, 2018

Good catch. thanks.
@bart0sh please also update #63849

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm label May 15, 2018

bart0sh added a commit to bart0sh/kubernetes that referenced this pull request May 15, 2018

fix commands running crictl
Running "kubeadm reset --cri-socket unix:///var/run/crio/crio.sock"
fails with this error:
[reset] Cleaning up running containers using crictl with socket unix:///var/run/crio/crio.sock
[reset] Failed to list running pods using crictl. Trying using docker instead.

The actual error returned by underlying API os/exec is:
fork/exec /usr/bin/crictl -r /var/run/crio/crio.sock info: no such file or directory

This is caused by passing full command line instead of executable
path as a first parameter to the Command API.

Fixed by passing correct parameters to the Command API.
Improved error output.

Fixed crictl commands stop->stopp, rm->rmp (taken from kubernetes#63862)

bart0sh added a commit to bart0sh/kubernetes that referenced this pull request May 15, 2018

fix commands running crictl
Running "kubeadm reset --cri-socket unix:///var/run/crio/crio.sock"
fails with this error:
[reset] Cleaning up running containers using crictl with socket unix:///var/run/crio/crio.sock
[reset] Failed to list running pods using crictl. Trying using docker instead.

The actual error returned by underlying API os/exec is:
fork/exec /usr/bin/crictl -r /var/run/crio/crio.sock info: no such file or directory

This is caused by passing full command line instead of executable
path as a first parameter to the Command API.

Fixed by passing correct parameters to the Command API.
Improved error output.

Fixed crictl commands stop->stopp, rm->rmp (taken from kubernetes#63862)
kubeadm: crictl reset commands fixes
Signed-off-by: Antonio Murdaca <runcom@redhat.com>

@runcom runcom force-pushed the runcom:fix-reset-crictl branch from bac44b1 to 0fec56c May 18, 2018

@kad

This comment has been minimized.

Copy link
Member

kad commented May 18, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm label May 18, 2018

@kad

This comment has been minimized.

Copy link
Member

kad commented May 23, 2018

/retest

@kad

This comment has been minimized.

Copy link
Member

kad commented May 23, 2018

@timothysc this one is needed for 1.11

@timothysc

This comment has been minimized.

Copy link
Member

timothysc commented May 23, 2018

/assign @timothysc

@timothysc
Copy link
Member

timothysc left a comment

/approve

But... do we have any tests that validate this behavior?

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented May 23, 2018

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kad, runcom, 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

@fejta-bot

This comment has been minimized.

Copy link

fejta-bot commented May 23, 2018

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

@k8s-github-robot

This comment has been minimized.

Copy link
Contributor

k8s-github-robot commented May 24, 2018

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot

This comment has been minimized.

Copy link
Contributor

k8s-github-robot commented May 24, 2018

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

@k8s-github-robot k8s-github-robot merged commit 42d6567 into kubernetes:master May 24, 2018

12 of 18 checks passed

Submit Queue Required Github CI test is not green: pull-kubernetes-e2e-gce
Details
pull-kubernetes-e2e-gce Job triggered.
Details
pull-kubernetes-e2e-gce-100-performance Job triggered.
Details
pull-kubernetes-e2e-kops-aws Job triggered.
Details
pull-kubernetes-kubemark-e2e-gce Job triggered.
Details
pull-kubernetes-kubemark-e2e-gce-big Job triggered.
Details
cla/linuxfoundation runcom authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-cross Skipped
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-gke Skipped
pull-kubernetes-integration 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.