Merge pull request #4862 from openshift-cherrypick-robot/cherry-pick-4740-to-release-4.17

[release-4.17] OCPBUGS-51003: daemon: add nil check for annotation fetching

Author: openshift-merge-bot[bot]

pkg/daemon/node.go

@@ -64,6 +64,9 @@ func getNodeAnnotation(node *corev1.Node, k string) (string, error) {
 
 // getNodeAnnotationExt is like getNodeAnnotation, but allows one to customize ENOENT handling
 func getNodeAnnotationExt(node *corev1.Node, k string, allowNoent bool) (string, error) {
+	if node == nil || node.Annotations == nil {
+		return "", fmt.Errorf("node object is nil")
+	}
 	v, ok := node.Annotations[k]
 	if !ok {
 		if !allowNoent {