Skip to content

Add filtering before DeleteOrEvictPods #1106

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

Merged
merged 3 commits into from
Dec 31, 2024
Merged

Add filtering before DeleteOrEvictPods #1106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61ec184
Add filtering before DeleteOrEvictPods
tiationg-kho Dec 15, 2024
dc2c91a
Merge branch 'aws:main' into 1097-daemon
tiationg-kho Dec 24, 2024
ac96fe3
Add unit test
tiationg-kho Dec 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions pkg/node/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ const (
RebalanceRecommendationTaint = "aws-node-termination-handler/rebalance-recommendation"

maxTaintValueLength = 63
daemonSet = "DaemonSet"
)

const (
Expand Down Expand Up @@ -144,6 +145,7 @@ func (n Node) CordonAndDrain(nodeName string, reason string, recorder recorderIn
}
if n.nthConfig.UseAPIServerCacheToListPods {
if pods != nil {
pods = n.FilterOutDaemonSetPods(pods)
err = n.drainHelper.DeleteOrEvictPods(pods.Items)
}
} else {
Expand Down Expand Up @@ -647,6 +649,23 @@ func (n Node) fetchAllPods(nodeName string) (*corev1.PodList, error) {
return n.drainHelper.Client.CoreV1().Pods("").List(context.TODO(), listOptions)
}

// FilterOutDaemonSetPods filters a list of pods to exclude DaemonSet pods when IgnoreDaemonSets is enabled
func (n *Node) FilterOutDaemonSetPods(pods *corev1.PodList) *corev1.PodList {
if !n.nthConfig.IgnoreDaemonSets {
return pods
}

var nonDaemonSetPods []corev1.Pod
for _, pod := range pods.Items {
if !isDaemonSetPod(pod) {
nonDaemonSetPods = append(nonDaemonSetPods, pod)
}
}

pods.Items = nonDaemonSetPods
return pods
}

func getDrainHelper(nthConfig config.Config, clientset *kubernetes.Clientset) (*drain.Helper, error) {
drainHelper := &drain.Helper{
Ctx: context.TODO(),
Expand Down Expand Up @@ -838,6 +857,15 @@ func filterPodForDeletion(podName, podNamespace string) func(pod corev1.Pod) dra
}
}

func isDaemonSetPod(pod corev1.Pod) bool {
for _, owner := range pod.OwnerReferences {
if owner.Kind == daemonSet {
return true
}
}
return false
}

type recorderInterface interface {
AnnotatedEventf(object runtime.Object, annotations map[string]string, eventType, reason, messageFmt string, args ...interface{})
}
41 changes: 41 additions & 0 deletions pkg/node/node_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/aws/aws-node-termination-handler/pkg/node"
h "github.com/aws/aws-node-termination-handler/pkg/test"
"github.com/aws/aws-node-termination-handler/pkg/uptime"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes/fake"
Expand Down Expand Up @@ -377,3 +378,43 @@ func TestUncordonIfRebootedTimeParseFailure(t *testing.T) {
err = tNode.UncordonIfRebooted(nodeName)
h.Assert(t, err != nil, "Failed to return error on UncordonIfReboted failure to parse time")
}

func TestFilterOutDaemonSetPods(t *testing.T) {
tNode, err := newNode(config.Config{IgnoreDaemonSets: true}, fake.NewSimpleClientset())
h.Ok(t, err)

mockPodList := &corev1.PodList{
Items: []corev1.Pod{
{
ObjectMeta: metav1.ObjectMeta{
Name: "mock-daemon-pod",
OwnerReferences: []metav1.OwnerReference{
{
Kind: "DaemonSet",
Name: "daemon-1",
},
},
},
},
{
ObjectMeta: metav1.ObjectMeta{
Name: "mock-replica-pod",
OwnerReferences: []metav1.OwnerReference{
{
Kind: "ReplicaSet",
Name: "replica-1",
},
},
},
},
{
ObjectMeta: metav1.ObjectMeta{
Name: "mock-regular-pod",
},
},
},
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: indentation seems off


filteredMockPodList := tNode.FilterOutDaemonSetPods(mockPodList)
h.Equals(t, 2, len(filteredMockPodList.Items))
}
Loading