Merge pull request #100465 from chrishenzie/nil-ptr-deref-in-logs

Fix nil ptr dereference in log line
This commit is contained in:
Kubernetes Prow Robot 2021-03-23 09:41:36 -07:00 committed by GitHub
commit bbb58fa085
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -404,11 +404,11 @@ func (rc *reconciler) syncStates() {
if volumeInDSW {
// Some pod needs the volume, don't clean it up and hope that
// reconcile() calls SetUp and reconstructs the volume in ASW.
klog.V(4).InfoS("Volume exists in desired state, skip cleaning up mounts", "pod", klog.KObj(reconstructedVolume.pod), "volumeSpecName", volume.volumeSpecName)
klog.V(4).InfoS("Volume exists in desired state, skip cleaning up mounts", "podName", volume.podName, "volumeSpecName", volume.volumeSpecName)
continue
}
// No pod needs the volume.
klog.InfoS("Could not construct volume information, cleaning up mounts", "pod", klog.KObj(reconstructedVolume.pod), "volumeSpecName", volume.volumeSpecName, "error", err)
klog.InfoS("Could not construct volume information, cleaning up mounts", "podName", volume.podName, "volumeSpecName", volume.volumeSpecName, "error", err)
rc.cleanupMounts(volume)
continue
}