compare only lastApplied annotation

Author: kobzonega

internal/annotations/annotations.go

@@ -1,7 +1,5 @@
 package annotations
 
-import "strings"
-
 const (
 	PrimaryResourceStorageAnnotation  = "ydb.tech/primary-resource-storage"
 	PrimaryResourceDatabaseAnnotation = "ydb.tech/primary-resource-database"
@@ -11,30 +9,17 @@ const (
 	LastAppliedAnnotation             = "ydb.tech/last-applied"
 )
 
-func GetYdbTechAnnotations(annotations map[string]string) map[string]string {
-	result := make(map[string]string)
-	for key, value := range annotations {
-		if strings.HasPrefix(key, "ydb.tech/") {
-			result[key] = value
-		}
-	}
-	return result
+func CompareLastAppliedAnnotation(map1, map2 map[string]string) bool {
+	value1 := getLastAppliedAnnotation(map1)
+	value2 := getLastAppliedAnnotation(map2)
+	return value1 == value2
 }
 
-func CompareMaps(map1, map2 map[string]string) bool {
-	if len(map1) != len(map2) {
-		return false
-	}
-	for key1, value1 := range map1 {
-		if value2, ok := map2[key1]; !ok || value2 != value1 {
-			return false
+func getLastAppliedAnnotation(annotations map[string]string) string {
+	for key, value := range annotations {
+		if key == LastAppliedAnnotation {
+			return value
 		}
 	}
-	return true
-}
-
-func CompareYdbTechAnnotations(map1, map2 map[string]string) bool {
-	map1 = GetYdbTechAnnotations(map1)
-	map2 = GetYdbTechAnnotations(map2)
-	return CompareMaps(map1, map2)
+	return ""
 }

internal/controllers/database/controller.go

@@ -71,7 +71,12 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		return ctrl.Result{RequeueAfter: DefaultRequeueDelay}, err
 	}
 
-	return r.Sync(ctx, resource)
+	result, err := r.Sync(ctx, resource)
+	if err != nil {
+		r.Log.Error(err, "unexpected Sync error")
+	}
+
+	return result, err
 }
 
 // Create FieldIndexer to usage for List requests in Reconcile

internal/controllers/storage/controller_test.go

@@ -188,18 +188,11 @@ var _ = Describe("Storage controller medium tests", func() {
 			))
 
 			By("check that delete StatefulSet event was detected...")
-			Expect(k8sClient.List(ctx,
-				&foundStatefulSets,
-				client.InNamespace(testobjects.YdbNamespace),
-			)).ShouldNot(HaveOccurred())
+			Expect(k8sClient.List(ctx, &foundStatefulSets, client.InNamespace(testobjects.YdbNamespace))).ShouldNot(HaveOccurred())
 			Expect(len(foundStatefulSets.Items)).Should(Equal(1))
-			Expect(k8sClient.Delete(ctx,
-				&foundStatefulSets.Items[0],
-			)).ShouldNot(HaveOccurred())
+			Expect(k8sClient.Delete(ctx, &foundStatefulSets.Items[0])).ShouldNot(HaveOccurred())
 			Eventually(func() int {
-				Expect(k8sClient.List(ctx, &foundStatefulSets,
-					client.InNamespace(testobjects.YdbNamespace),
-				))
+				Expect(k8sClient.List(ctx, &foundStatefulSets, client.InNamespace(testobjects.YdbNamespace))).ShouldNot(HaveOccurred())
 				return len(foundStatefulSets.Items)
 			}, test.Timeout, test.Interval).Should(Equal(1))
 		})

internal/resources/predicate.go

@@ -13,7 +13,7 @@ import (
 func LastAppliedAnnotationPredicate() predicate.Predicate {
 	return predicate.Funcs{
 		UpdateFunc: func(e event.UpdateEvent) bool {
-			return !annotations.CompareYdbTechAnnotations(
+			return !annotations.CompareLastAppliedAnnotation(
 				e.ObjectOld.GetAnnotations(),
 				e.ObjectNew.GetAnnotations(),
 			)