From 2e01560fd0c1fc6eec607c5a01022384feda67d6 Mon Sep 17 00:00:00 2001 From: Sagar Muchhal Date: Sun, 21 Mar 2021 18:11:50 -0700 Subject: [PATCH] Adds actual context to node drainer code Signed-off-by: Sagar Muchhal --- staging/src/k8s.io/kubectl/pkg/drain/drain.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/staging/src/k8s.io/kubectl/pkg/drain/drain.go b/staging/src/k8s.io/kubectl/pkg/drain/drain.go index ad24ce1d678..87287bde70c 100644 --- a/staging/src/k8s.io/kubectl/pkg/drain/drain.go +++ b/staging/src/k8s.io/kubectl/pkg/drain/drain.go @@ -151,7 +151,7 @@ func (d *Helper) DeletePod(pod corev1.Pod) error { return err } } - return d.Client.CoreV1().Pods(pod.Namespace).Delete(context.TODO(), pod.Name, d.makeDeleteOptions()) + return d.Client.CoreV1().Pods(pod.Namespace).Delete(d.getContext(), pod.Name, d.makeDeleteOptions()) } // EvictPod will evict the give pod, or return an error if it couldn't @@ -176,7 +176,7 @@ func (d *Helper) EvictPod(pod corev1.Pod, policyGroupVersion string) error { } // Remember to change change the URL manipulation func when Eviction's version change - return d.Client.PolicyV1beta1().Evictions(eviction.Namespace).Evict(context.TODO(), eviction) + return d.Client.PolicyV1beta1().Evictions(eviction.Namespace).Evict(d.getContext(), eviction) } // GetPodsForDeletion receives resource info for a node, and returns those pods as PodDeleteList, @@ -189,7 +189,7 @@ func (d *Helper) GetPodsForDeletion(nodeName string) (*PodDeleteList, []error) { return nil, []error{err} } - podList, err := d.Client.CoreV1().Pods(metav1.NamespaceAll).List(context.TODO(), metav1.ListOptions{ + podList, err := d.Client.CoreV1().Pods(metav1.NamespaceAll).List(d.getContext(), metav1.ListOptions{ LabelSelector: labelSelector.String(), FieldSelector: fields.SelectorFromSet(fields.Set{"spec.nodeName": nodeName}).String()}) if err != nil { @@ -237,7 +237,7 @@ func (d *Helper) DeleteOrEvictPods(pods []corev1.Pod) error { // TODO(justinsb): unnecessary? getPodFn := func(namespace, name string) (*corev1.Pod, error) { - return d.Client.CoreV1().Pods(namespace).Get(context.TODO(), name, metav1.GetOptions{}) + return d.Client.CoreV1().Pods(namespace).Get(d.getContext(), name, metav1.GetOptions{}) } if !d.DisableEviction {