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

Merged
merged 1 commit into from
May 24, 2018
Merged

kubeadm: crictl reset commands fixes #63862

merged 1 commit into from
May 24, 2018

Conversation

runcom
Copy link
Contributor

@runcom 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

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. 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. labels May 15, 2018
@k8s-ci-robot k8s-ci-robot requested review from kad and liztio May 15, 2018 13:21
@k8s-ci-robot k8s-ci-robot added area/kubeadm sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. labels May 15, 2018
@kad
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 "Looks good to me", indicates that a PR is ready to be merged. label May 15, 2018
bart0sh added a commit to bart0sh/kubernetes that referenced this pull request May 15, 2018
@bart0sh
fix commands running crictl
52ed4cc 
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)
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 17, 2018
@runcom
kubeadm: crictl reset commands fixes
0fec56c 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
@k8s-ci-robot k8s-ci-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels May 18, 2018
@kad
Copy link
Member

kad commented May 18, 2018

/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 18, 2018
@kad
Copy link
Member

kad commented May 23, 2018

/retest

@kad
Copy link
Member

kad commented May 23, 2018

@timothysc this one is needed for 1.11

@timothysc
Copy link
Member

/assign @timothysc

timothysc
timothysc approved these changes May 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.

/approve

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

@k8s-ci-robot
Copy link
Contributor

[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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 23, 2018
@fejta-bot
Copy link

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

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

@k8s-github-robot
Copy link

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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timothysc timothysc timothysc approved these changes

@kad kad Awaiting requested review from kad

@liztio liztio Awaiting requested review from liztio

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

kubeadm-1.10 does not cleanup pods in CRI-O with recent crictl versions
6 participants
@runcom @kad @timothysc @k8s-ci-robot @fejta-bot @k8s-github-robot