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

oc adm drain: add --selector and --pod-selector #17554

Closed
dustymabe opened this issue Dec 1, 2017 · 0 comments
Closed

oc adm drain: add --selector and --pod-selector #17554

dustymabe opened this issue Dec 1, 2017 · 0 comments
Assignees
@juanvallejo
Labels
component/cli kind/post-rebase priority/P1

Comments

@dustymabe
Copy link
Member

oc adm manage-node --evacuate is now deprecated but there was some functionality there that is missing in the new drain command. Particularly --selector and --pod-selector. The --pod-selector on evacuate allowed me to workaround #17522. See #17522 (comment):

[root@origin-master-1 ~]# oc adm manage-node --evacuate --force x.x.x.x --pod-selector='glusterfs notin (storage-pod)'                                                                                                                
Flag --evacuate has been deprecated, use 'oadm drain NODE' instead

Migrating these pods on node:
<snip>
@dustymabe dustymabe changed the title oc adm drain: add --selector and --pod-selctor oc adm drain: add --selector and --pod-selector Dec 1, 2017
@juanvallejo juanvallejo self-assigned this Dec 1, 2017
This was referenced Dec 5, 2017
Merged
Merged
k8s-github-robot pushed a commit to kubernetes/kubernetes that referenced this issue Dec 19, 2017
Merge pull request #56864 from juanvallejo/jvallejo/add-selector-kube…
3ef6741 
…ctl-drain

Automatic merge from submit-queue (batch tested with PRs 55751, 57337, 56406, 56864, 57347). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Add pod-selector kubectl drain

**Release note**:
```release-note
Added the ability to select pods in a chosen node to be drained, based on given pod label-selector
```

This patch adds the ability to select pods in a chosen node to be drained, based on given pod label-selector. Related downstream issue: openshift/origin#17554

Further, it removes explicit, specific, pod-controller check. The `drain` command currently fails if a pod has a controller of a `kind` [not explicitly handled in the command itself](https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/drain.go#L331). This causes `drain` to be unusable if a node contains pods managed by third-party, or "unknown" controllers.

Based on [this comment](https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/drain.go#L353), the expectation was to fail if a pod's controller was not found for whatever reason. I believe that the `drain` command should not care about the existence of a pod controller. It should only care whether a pod has one, and act according to that controller kind. This solves a downstream bug: openshift/origin#17563

cc @fabianofranz @deads2k @kubernetes/sig-cli-misc
openshift-merge-robot added a commit that referenced this issue Dec 21, 2017
@openshift-merge-robot
Merge pull request #17616 from juanvallejo/jvallejo/add-selector-oc-d…
d8c46e4 
…rain

Automatic merge from submit-queue (batch tested with PRs 17072, 17616).

Add --selector, --pod-selector flags `oc adm drain`

Fixes #17554
Fixes #17563
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1525340

Picks kubernetes/kubernetes#52917, kubernetes/kubernetes#54083, and kubernetes/kubernetes#56864 to bring in `--selector` and `--pod-selector` flag support to `oc adm drain`.

cc @openshift/cli-review @deads2k @dustymabe
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@juanvallejo juanvallejo

Labels
component/cli kind/post-rebase priority/P1
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@mfojtik @juanvallejo @dustymabe