fixes last-applied annotation

Author: kobzonega

internal/annotations/annotations.go

@@ -8,7 +8,7 @@ const (
 	RemoteResourceVersionAnnotation   = "ydb.tech/remote-resource-version"
 	ConfigurationChecksum             = "ydb.tech/configuration-checksum"
 	RemoteFinalizerKey                = "ydb.tech/remote-finalizer"
-	LastAppliedAnnotation             = "ydb.tech/last-applied"
+	LastApplied                       = "ydb.tech/last-applied"
 )
 
 func GetYdbTechAnnotations(annotations map[string]string) map[string]string {
@@ -23,31 +23,13 @@ func GetYdbTechAnnotations(annotations map[string]string) map[string]string {
 
 func GetLastAppliedAnnotation(annotations map[string]string) string {
 	for key, value := range annotations {
-		if key == LastAppliedAnnotation {
+		if key == LastApplied {
 			return value
 		}
 	}
 	return ""
 }
 
-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
-		}
-	}
-	return true
-}
-
-func CompareYdbTechAnnotations(map1, map2 map[string]string) bool {
-	map1 = GetYdbTechAnnotations(map1)
-	map2 = GetYdbTechAnnotations(map2)
-	return CompareMaps(map1, map2)
-}
-
 func CompareLastAppliedAnnotation(map1, map2 map[string]string) bool {
 	value1 := GetLastAppliedAnnotation(map1)
 	value2 := GetLastAppliedAnnotation(map2)

internal/resources/database.go

@@ -42,13 +42,11 @@ func (b *DatabaseBuilder) NewLabels() labels.Labels {
 
 func (b *DatabaseBuilder) NewAnnotations() map[string]string {
 	an := annotations.GetYdbTechAnnotations(b.Annotations)
-	an[annotations.ConfigurationChecksum] = GetSHA256Checksum(b.Spec.Configuration)
-	delete(an, annotations.LastAppliedAnnotation)
-
 	for k, v := range b.Spec.AdditionalAnnotations {
 		an[k] = v
 	}
-
+	an[annotations.ConfigurationChecksum] = GetSHA256Checksum(b.Spec.Configuration)
+	delete(an, annotations.LastApplied)
 	return an
 }
 

internal/resources/resource.go

@@ -85,7 +85,7 @@ type ResourceBuilder interface {
 }
 
 var (
-	annotator  = patch.NewAnnotator(ydbannotations.LastAppliedAnnotation)
+	annotator  = patch.NewAnnotator(ydbannotations.LastApplied)
 	patchMaker = patch.NewPatchMaker(annotator)
 )
 

internal/resources/storage.go

@@ -42,13 +42,11 @@ func (b *StorageClusterBuilder) NewLabels() labels.Labels {
 
 func (b *StorageClusterBuilder) NewAnnotations() map[string]string {
 	an := annotations.GetYdbTechAnnotations(b.Annotations)
-	an[annotations.ConfigurationChecksum] = GetSHA256Checksum(b.Spec.Configuration)
-	delete(an, annotations.LastAppliedAnnotation)
-
 	for k, v := range b.Spec.AdditionalAnnotations {
 		an[k] = v
 	}
-
+	an[annotations.ConfigurationChecksum] = GetSHA256Checksum(b.Spec.Configuration)
+	delete(an, annotations.LastApplied)
 	return an
 }
 

internal/resources/storage_init_job.go

@@ -60,9 +60,7 @@ func GetInitJobBuilder(storage *api.Storage) ResourceBuilder {
 	jobName := fmt.Sprintf(InitJobNameFormat, storage.Name)
 
 	jobLabels := labels.Common(storage.Name, labels.Labels{})
-	jobLabels.Merge(storage.Spec.AdditionalLabels)
-
-	jobAnnotations := CopyDict(storage.Spec.AdditionalAnnotations)
+	jobAnnotations := make(map[string]string)
 
 	if storage.Spec.InitJob != nil {
 		if storage.Spec.InitJob.AdditionalLabels != nil {