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

Pod UID mismatches should only warn on CNI DEL (#763)

Browse Source
This commit is contained in:
Doug Smith 2021-11-23 03:52:45 -05:00 committed by GitHub
parent 84fde9d711
commit b9d0d93d6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/multus/multus.go
View File

@ -521,7 +521,7 @@ func isCriticalRequestRetriable(err error) bool {
return false return false
} }
func getPod(kubeClient *k8s.ClientInfo, k8sArgs *types.K8sArgs, ignoreNotFound bool) (*v1.Pod, error) { func getPod(kubeClient *k8s.ClientInfo, k8sArgs *types.K8sArgs, warnOnly bool) (*v1.Pod, error) {
if kubeClient == nil { if kubeClient == nil {
return nil, nil return nil, nil
} }
@ -542,7 +542,7 @@ func getPod(kubeClient *k8s.ClientInfo, k8sArgs *types.K8sArgs, ignoreNotFound b
if waitErr != nil { if waitErr != nil {
return nil, cmdErr(k8sArgs, "error waiting for pod: %v", err) return nil, cmdErr(k8sArgs, "error waiting for pod: %v", err)
} }
} else if ignoreNotFound && errors.IsNotFound(err) { } else if warnOnly && errors.IsNotFound(err) {
// If not found, proceed to remove interface with cache // If not found, proceed to remove interface with cache
return nil, nil return nil, nil
} else { } else {
@ -552,7 +552,14 @@ func getPod(kubeClient *k8s.ClientInfo, k8sArgs *types.K8sArgs, ignoreNotFound b
} }
if podUID != "" && string(pod.UID) != podUID { if podUID != "" && string(pod.UID) != podUID {
return nil, cmdErr(k8sArgs, "expected pod UID %q but got %q from Kube API", podUID, pod.UID) msg := fmt.Sprintf("expected pod UID %q but got %q from Kube API", podUID, pod.UID)
if warnOnly {
// On CNI DEL we just operate on the cache when these mismatch, we don't error out.
// For example: stateful sets namespace/name can remain the same while podUID changes.
logging.Verbosef("warning: %s", msg)
return nil, nil
}
return nil, cmdErr(k8sArgs, msg)
} }
return pod, nil return pod, nil