fixing HashAnnotationDiffer function

TomerNewman · k8s-ci-robot · commit ce6f5827300b · 2025-06-26T03:08:29.000-07:00
The NMC logic ensure we call this
function in such a way we never fall
into one of the 2 buggy `if` sections.
That said, if the implementation were
to change, we could hit this bug in
real time, therefore, this method
should be fixed.
diff --git a/internal/pod/workerpodmanager.go b/internal/pod/workerpodmanager.go
@@ -304,11 +304,11 @@ func (wpmi *workerPodManagerImpl) GetTolerationsAnnotation(p *v1.Pod) string {
 func (wpmi *workerPodManagerImpl) HashAnnotationDiffer(p1, p2 *v1.Pod) bool {
 
 	if p1 == nil && p2 == nil {
-		return true
+		return false
 	}
 
 	if (p1 == nil && p2 != nil) || (p1 != nil) && (p2 == nil) {
-		return false
+		return true
 	}
 
 	return p1.Annotations[hashAnnotationKey] != p2.Annotations[hashAnnotationKey]

Original file line number	Diff line number	Diff line change
`@@ -304,11 +304,11 @@ func (wpmi workerPodManagerImpl) GetTolerationsAnnotation(p v1.Pod) string {`
`304`	`304`	`func (wpmi workerPodManagerImpl) HashAnnotationDiffer(p1, p2 v1.Pod) bool {`
`305`	`305`
`306`	`306`	`if p1 == nil && p2 == nil {`
`307`		`- return true`
	`307`	`+ return false`
`308`	`308`	`}`
`309`	`309`
`310`	`310`	`if (p1 == nil && p2 != nil) \|\| (p1 != nil) && (p2 == nil) {`
`311`		`- return false`
	`311`	`+ return true`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`return p1.Annotations[hashAnnotationKey] != p2.Annotations[hashAnnotationKey]`