kubectl: drain daemonSetFilter with other APIVersion #128779

alexey-gavrilov-flant · 2024-11-13T07:43:24Z

What type of PR is this?

/kind bug

What this PR does / why we need it:

Since I can't reopen a past fix attempt. I created a new PR
This is a copy of another PR #101556

When using the drain command of kubectl, all DaemonSets will be filtered. But the way to judge that workloadRef is DaemonSet in Filter only considers the Kind of workloadRef and ignores the APIVersion of workloadRef.

kubernetes/staging/src/k8s.io/kubectl/pkg/drain/filters.go

Line 182 in f631c0e

    
           if controllerRef == nil || controllerRef.Kind != appsv1.SchemeGroupVersion.WithKind("DaemonSet").Kind {

However, the logic that follows immediately obtains all apps/v1 DaemonSet, which will cause if there is a crd with the same name as Kind (Kind=DaemonSet), it will be regarded as a native DaemonSet, but in fact, the original DaemonSet cannot obtain this CRD and thus DrainNode The problem of failure.

kubernetes/staging/src/k8s.io/kubectl/pkg/drain/filters.go

Lines 190 to 196 in f631c0e

    
           if _, err := d.Client.AppsV1().DaemonSets(pod.Namespace).Get(context.TODO(), controllerRef.Name, metav1.GetOptions{}); err != nil { 
        
           	// remove orphaned pods with a warning if --force is used 
        
           	if apierrors.IsNotFound(err) && d.Force { 
        
           		return MakePodDeleteStatusWithWarning(true, err.Error()) 
        
           	} 
        
           	return MakePodDeleteStatusWithError(err.Error())

Example:
there is a crd kruise-daemonSet

apiVersion: apps.kruise.io/v1alpha1
kind: DaemonSet
metadata:
  annotations:

When we DrainNode, it mistakenly regards it as a native DaemonSet, but the native DaemonSet cannot be obtained and an error is reported

So I added detailed judgments here to find if the workload is native DaemonSet or not.

Which issue(s) this PR fixes:

Fixes #101557

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

Signed-off-by: Aleksey Gavrilov <[email protected]>

k8s-ci-robot · 2024-11-13T07:43:33Z

Welcome @alexey-gavrilov-flant!

It looks like this is your first PR to kubernetes/kubernetes 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/kubernetes has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

k8s-ci-robot · 2024-11-13T07:43:34Z

Hi @alexey-gavrilov-flant. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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-sigs/prow repository.

alexey-gavrilov-flant · 2024-12-16T08:41:01Z

/auto-cc

seans3 · 2024-12-19T08:06:52Z

/ok-to-test

alexey-gavrilov-flant · 2025-01-29T09:05:13Z

@seans3 What's the next step?

k8s-triage-robot · 2025-04-29T09:28:47Z

The Kubernetes project currently lacks enough contributors to adequately respond to all PRs.

This bot triages PRs according to the following rules:

After 90d of inactivity, lifecycle/stale is applied
After 30d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
After 30d of inactivity since lifecycle/rotten was applied, the PR is closed

You can:

Mark this PR as fresh with /remove-lifecycle stale
Close this PR with /close
Offer to help out with Issue Triage

Please send feedback to sig-contributor-experience at kubernetes/community.

/lifecycle stale

k8s-triage-robot · 2025-05-29T10:23:58Z

The Kubernetes project currently lacks enough active contributors to adequately respond to all PRs.

This bot triages PRs according to the following rules:

After 90d of inactivity, lifecycle/stale is applied
After 30d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
After 30d of inactivity since lifecycle/rotten was applied, the PR is closed

You can:

Mark this PR as fresh with /remove-lifecycle rotten
Close this PR with /close
Offer to help out with Issue Triage

Please send feedback to sig-contributor-experience at kubernetes/community.

/lifecycle rotten

soltysh

/lgtm
/approve
/triage accepted
/priority backlog

k8s-ci-robot · 2025-06-26T09:36:25Z

LGTM label has been added.

Git tree hash: a0922e7e0c636dada97571cfde70225c898a6f52

k8s-ci-robot · 2025-06-26T09:36:34Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alexey-gavrilov-flant, soltysh

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:

~~staging/src/k8s.io/kubectl/OWNERS~~ [soltysh]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

soltysh · 2025-06-26T09:36:56Z

/refresh

pacoxu · 2025-06-27T02:29:04Z

/test pull-kubernetes-cmd

[kubectl] drain daemonSetFilter with other APIVersion

a528638

Signed-off-by: Aleksey Gavrilov <[email protected]>

k8s-ci-robot added needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 13, 2024

k8s-ci-robot added the needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label Nov 13, 2024

k8s-ci-robot requested review from mpuckett159 and soltysh November 13, 2024 07:43

k8s-ci-robot added area/kubectl sig/cli Categorizes an issue or PR as relevant to SIG CLI. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Nov 13, 2024

alexey-gavrilov-flant changed the title ~~[kubectl] drain daemonSetFilter with other APIVersion~~ kubectl: drain daemonSetFilter with other APIVersion Nov 13, 2024

alexey-gavrilov-flant marked this pull request as ready for review November 13, 2024 11:19

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 13, 2024

k8s-ci-robot requested review from brianpursley and seans3 November 13, 2024 11:19

alexey-gavrilov-flant mentioned this pull request Nov 19, 2024

[BUG] When draining a node, an error about unknown DaemonSet occurs. openkruise/kruise#1831

Closed

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 19, 2024

k8s-ci-robot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Apr 29, 2025

k8s-ci-robot added lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels May 29, 2025

soltysh approved these changes Jun 26, 2025

View reviewed changes

k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/backlog Higher priority than priority/awaiting-more-evidence. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jun 26, 2025

k8s-ci-robot assigned soltysh Jun 26, 2025

k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jun 26, 2025

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 26, 2025

k8s-ci-robot merged commit 6ed5b60 into kubernetes:master Jun 27, 2025
14 checks passed

github-project-automation bot moved this from Needs Triage to Done in SIG CLI Jun 27, 2025

k8s-ci-robot added this to the v1.34 milestone Jun 27, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

kubectl: drain daemonSetFilter with other APIVersion #128779

kubectl: drain daemonSetFilter with other APIVersion #128779

Uh oh!

alexey-gavrilov-flant commented Nov 13, 2024 •

edited

Loading

Uh oh!

k8s-ci-robot commented Nov 13, 2024

Uh oh!

k8s-ci-robot commented Nov 13, 2024

Uh oh!

alexey-gavrilov-flant commented Dec 16, 2024

Uh oh!

seans3 commented Dec 19, 2024

Uh oh!

alexey-gavrilov-flant commented Jan 29, 2025

Uh oh!

k8s-triage-robot commented Apr 29, 2025

Uh oh!

k8s-triage-robot commented May 29, 2025

Uh oh!

soltysh left a comment

Uh oh!

k8s-ci-robot commented Jun 26, 2025

Uh oh!

k8s-ci-robot commented Jun 26, 2025

Uh oh!

soltysh commented Jun 26, 2025

Uh oh!

pacoxu commented Jun 27, 2025

Uh oh!

Uh oh!

Uh oh!

	if _, err := d.Client.AppsV1().DaemonSets(pod.Namespace).Get(context.TODO(), controllerRef.Name, metav1.GetOptions{}); err != nil {
	// remove orphaned pods with a warning if --force is used
	if apierrors.IsNotFound(err) && d.Force {
	return MakePodDeleteStatusWithWarning(true, err.Error())
	}

	return MakePodDeleteStatusWithError(err.Error())

kubectl: drain daemonSetFilter with other APIVersion #128779

kubectl: drain daemonSetFilter with other APIVersion #128779

Uh oh!

Conversation

alexey-gavrilov-flant commented Nov 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

Uh oh!

k8s-ci-robot commented Nov 13, 2024

Uh oh!

k8s-ci-robot commented Nov 13, 2024

Uh oh!

alexey-gavrilov-flant commented Dec 16, 2024

Uh oh!

seans3 commented Dec 19, 2024

Uh oh!

alexey-gavrilov-flant commented Jan 29, 2025

Uh oh!

k8s-triage-robot commented Apr 29, 2025

Uh oh!

k8s-triage-robot commented May 29, 2025

Uh oh!

soltysh left a comment

Choose a reason for hiding this comment

Uh oh!

k8s-ci-robot commented Jun 26, 2025

Uh oh!

k8s-ci-robot commented Jun 26, 2025

Uh oh!

soltysh commented Jun 26, 2025

Uh oh!

pacoxu commented Jun 27, 2025

Uh oh!

Uh oh!

Uh oh!

alexey-gavrilov-flant commented Nov 13, 2024 •

edited

Loading