Merge pull request kubernetes-csi#1302 from ConnorJC3/fix-content-resync

Queue resyncs in `ShouldEnqueueContentChange`

Author: k8s-ci-robot

pkg/utils/util.go

@@ -680,6 +680,10 @@ func GetDynamicSnapshotContentNameForGroupSnapshot(groupSnapshot *crdv1beta1.Vol
 // If the VolumeSnapshotContent object still contains other changes after this sanitization, the changes
 // are potentially meaningful and the object is enqueued to be considered for syncing
 func ShouldEnqueueContentChange(old *crdv1.VolumeSnapshotContent, new *crdv1.VolumeSnapshotContent) bool {
+	// Always enqueue resyncs, which show up as an update with no change (thus no new version)
+	if old.ResourceVersion == new.ResourceVersion {
+		return true
+	}
 	sanitized := new.DeepCopy()
 	// ResourceVersion always changes between revisions
 	sanitized.ResourceVersion = old.ResourceVersion
@@ -693,7 +697,7 @@ func ShouldEnqueueContentChange(old *crdv1.VolumeSnapshotContent, new *crdv1.Vol
 		if sanitized.Annotations == nil {
 			sanitized.Annotations = map[string]string{}
 		}
-		for annotation, _ := range sidecarControlledContentAnnotations {
+		for annotation := range sidecarControlledContentAnnotations {
 			if value, ok := old.Annotations[annotation]; ok {
 				sanitized.Annotations[annotation] = value
 			} else {
@@ -702,7 +706,7 @@ func ShouldEnqueueContentChange(old *crdv1.VolumeSnapshotContent, new *crdv1.Vol
 		}
 	} else {
 		// Old content has no annotations, so delete any sidecar-controlled annotations present on the new content
-		for annotation, _ := range sidecarControlledContentAnnotations {
+		for annotation := range sidecarControlledContentAnnotations {
 			delete(sanitized.Annotations, annotation)
 		}
 	}

pkg/utils/util_test.go

@@ -489,9 +489,30 @@ func TestShouldEnqueueContentChange(t *testing.T) {
 			},
 			expectedResult: true,
 		},
+		{
+			name: "resync from informer (old matches new including resource version)",
+			old: &crdv1.VolumeSnapshotContent{
+				ObjectMeta: metav1.ObjectMeta{
+					ResourceVersion: oldValue,
+				},
+			},
+			new: &crdv1.VolumeSnapshotContent{
+				ObjectMeta: metav1.ObjectMeta{
+					ResourceVersion: oldValue,
+				},
+			},
+			expectedResult: true,
+		},
 	}
 	for _, tc := range testcases {
 		t.Run(tc.name, func(t *testing.T) {
+			// Inject resource version unless it is already set in test object
+			if tc.old.ResourceVersion == "" {
+				tc.old.ResourceVersion = oldValue
+			}
+			if tc.new.ResourceVersion == "" {
+				tc.old.ResourceVersion = newValue
+			}
 			result := ShouldEnqueueContentChange(tc.old, tc.new)
 			if result != tc.expectedResult {
 				t.Fatalf("Incorrect result: Expected %v received %v", tc.expectedResult, result)