github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-10 05:10:10 +00:00
Code Issues Projects Releases Wiki Activity

adds context to GetPodAPILiveQuery

Browse Source
This commit is contained in:
dougbtv
2024-12-19 14:41:32 -05:00
parent fc72ddbd24
commit f186370654
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/k8sclient/k8sclient.go
View File

@@ -92,8 +92,8 @@ func (c *ClientInfo) GetPodContext(ctx context.Context, namespace, name string)
} }
// GetPodAPILiveQuery does a live API query for the pod, instead of using informers, for cases when a failure occurred, as to prevent a cache miss. // GetPodAPILiveQuery does a live API query for the pod, instead of using informers, for cases when a failure occurred, as to prevent a cache miss.
func (c *ClientInfo) GetPodAPILiveQuery(namespace, name string) (*v1.Pod, error) { func (c *ClientInfo) GetPodAPILiveQuery(ctx context.Context, namespace, name string) (*v1.Pod, error) {
return c.Client.CoreV1().Pods(namespace).Get(context.TODO(), name, metav1.GetOptions{}) return c.Client.CoreV1().Pods(namespace).Get(ctx, name, metav1.GetOptions{})
} }
// DeletePod deletes a pod from kubernetes // DeletePod deletes a pod from kubernetes

4
pkg/multus/multus.go
View File

@@ -558,7 +558,9 @@ func GetPod(kubeClient *k8s.ClientInfo, k8sArgs *types.K8sArgs, isDel bool) (*v1
// Try one more time to get the pod directly from the apiserver; // Try one more time to get the pod directly from the apiserver;
// TODO: figure out why static pods don't show up via the informer // TODO: figure out why static pods don't show up via the informer
// and always hit this case. // and always hit this case.
pod, err = kubeClient.GetPodAPILiveQuery(podNamespace, podName) ctx, cancel := context.WithTimeout(context.TODO(), pollDuration)
defer cancel()
pod, err = kubeClient.GetPodAPILiveQuery(ctx, podNamespace, podName)
if err != nil { if err != nil {
return nil, cmdErr(k8sArgs, "error waiting for pod: %v", err) return nil, cmdErr(k8sArgs, "error waiting for pod: %v", err)
} }