chore: removed deprecations, that were planned to be removed in 0.52

.github/workflows/main.yaml

@@ -52,8 +52,8 @@ jobs:
           echo "Saved $(formatByteCount $SAVED)"
       - name: Checkout code
         uses: actions/checkout@v5
-      - name: Restore binaries from cache
-        uses: actions/cache/restore@v4
+      - name: Prepare binary cache
+        uses: actions/cache@v4
         with:
           path: ./bin
           key: binary
@@ -103,8 +103,3 @@ jobs:
         if: success() || failure()
         with:
           report_paths: 'report.xml'
-      - name: Prepare binary cache
-        uses: actions/cache@v4
-        with:
-          path: ./bin
-          key: binary

.github/workflows/release.yaml

@@ -14,8 +14,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
-      - name: Restore binaries from cache
-        uses: actions/cache/restore@v4
+      - name: Prepare binary cache
+        uses: actions/cache@v4
         with:
           path: ./bin
           key: binary
@@ -39,11 +39,6 @@ jobs:
           gh release upload ${{github.event.release.tag_name}} ./dist/install-no-webhook.yaml#install-no-webhook.yaml --clobber || echo "fix me NOT enough security permissions"
           gh release upload ${{github.event.release.tag_name}} ./dist/install-with-webhook.yaml#install-with-webhook.yaml --clobber || echo "fix me NOT enough security permissions"
           gh release upload ${{github.event.release.tag_name}} ./config/crd/overlay/crd.yaml#crd.yaml --clobber || echo "fix me NOT enough security permissions"
-      - name: Prepare binary cache
-        uses: actions/cache@v4
-        with:
-          path: ./bin
-          key: binary
       - uses: actions/upload-artifact@v5
         with:
           name: olm

api/operator/v1/vlagent_types.go

@@ -289,16 +289,13 @@ func (cr *VLAgent) DefaultStatusFields(vs *VLAgentStatus) {
 	vs.Replicas = replicaCount
 }
 
-// AnnotationsFiltered implements build.builderOpts interface
-func (cr *VLAgent) AnnotationsFiltered() map[string]string {
-	if cr.Spec.ManagedMetadata == nil {
-		return nil
-	}
-	dst := make(map[string]string, len(cr.Spec.ManagedMetadata.Annotations))
-	for k, v := range cr.Spec.ManagedMetadata.Annotations {
-		dst[k] = v
+// FinalAnnotations implements build.builderOpts interface
+func (cr *VLAgent) FinalAnnotations() map[string]string {
+	var v map[string]string
+	if cr.Spec.ManagedMetadata != nil {
+		v = labels.Merge(cr.Spec.ManagedMetadata.Annotations, v)
 	}
-	return dst
+	return v
 }
 
 // SelectorLabels returns selector labels for querying any vlagent related resources
@@ -321,14 +318,13 @@ func (cr *VLAgent) PodLabels() map[string]string {
 	return labels.Merge(cr.Spec.PodMetadata.Labels, lbls)
 }
 
-// AllLabels returns global labels for all vlagent related resources
-func (cr *VLAgent) AllLabels() map[string]string {
-	selectorLabels := cr.SelectorLabels()
-	// fast path
-	if cr.Spec.ManagedMetadata == nil {
-		return selectorLabels
+// FinalLabels returns global labels for all vlagent related resources
+func (cr *VLAgent) FinalLabels() map[string]string {
+	v := cr.SelectorLabels()
+	if cr.Spec.ManagedMetadata != nil {
+		v = labels.Merge(cr.Spec.ManagedMetadata.Labels, v)
 	}
-	return labels.Merge(selectorLabels, cr.Spec.ManagedMetadata.Labels)
+	return v
 }
 
 // PrefixedName returns name of resource with fixed prefix

api/operator/v1/vlcluster_types.go

@@ -163,10 +163,11 @@ func (cr *VLCluster) PodAnnotations(kind vmv1beta1.ClusterComponent) map[string]
 
 // FinalAnnotations returns global annotations to be applied by objects generate for vlcluster
 func (cr *VLCluster) FinalAnnotations() map[string]string {
-	if cr.Spec.ManagedMetadata == nil {
-		return nil
+	var v map[string]string
+	if cr.Spec.ManagedMetadata != nil {
+		v = labels.Merge(cr.Spec.ManagedMetadata.Annotations, v)
 	}
-	return cr.Spec.ManagedMetadata.Annotations
+	return v
 }
 
 // PrefixedName returns prefixed name for the given component kind
@@ -181,12 +182,11 @@ func (cr *VLCluster) PrefixedInternalName(kind vmv1beta1.ClusterComponent) strin
 
 // FinalLabels adds cluster labels to the base labels and filters by prefix if needed
 func (cr *VLCluster) FinalLabels(kind vmv1beta1.ClusterComponent) map[string]string {
-	baseLabels := vmv1beta1.AddClusterLabels(cr.SelectorLabels(kind), "vl")
-	if cr.Spec.ManagedMetadata == nil {
-		// fast path
-		return baseLabels
+	v := vmv1beta1.AddClusterLabels(cr.SelectorLabels(kind), "vl")
+	if cr.Spec.ManagedMetadata != nil {
+		v = labels.Merge(cr.Spec.ManagedMetadata.Labels, v)
 	}
-	return labels.Merge(cr.Spec.ManagedMetadata.Labels, baseLabels)
+	return v
 }
 
 // UnmarshalJSON implements json.Unmarshaler interface
@@ -737,11 +737,6 @@ func (cr *VLCluster) AvailableStorageNodeIDs(requestsType string) []int32 {
 	return result
 }
 
-// AnnotationsFiltered implements finalize.crdObject interface
-func (cr *VLCluster) AnnotationsFiltered() map[string]string {
-	return cr.FinalAnnotations()
-}
-
 // LastAppliedSpecAsPatch return last applied cluster spec as patch annotation
 func (cr *VLCluster) LastAppliedSpecAsPatch() (client.Patch, error) {
 	return vmv1beta1.LastAppliedChangesAsPatch(cr.Spec)

api/operator/v1/vlsingle_types.go

@@ -227,15 +227,13 @@ func (cr *VLSingle) ProbeNeedLiveness() bool {
 	return false
 }
 
-func (cr *VLSingle) AnnotationsFiltered() map[string]string {
-	if cr.Spec.ManagedMetadata == nil {
-		return nil
-	}
-	dst := make(map[string]string, len(cr.Spec.ManagedMetadata.Annotations))
-	for k, v := range cr.Spec.ManagedMetadata.Annotations {
-		dst[k] = v
+// FinalAnnotations returns annotations to be applied for created objects
+func (cr *VLSingle) FinalAnnotations() map[string]string {
+	var v map[string]string
+	if cr.Spec.ManagedMetadata != nil {
+		v = labels.Merge(cr.Spec.ManagedMetadata.Annotations, v)
 	}
-	return dst
+	return v
 }
 
 // SelectorLabels returns unique labels for object
@@ -257,15 +255,13 @@ func (cr *VLSingle) PodLabels() map[string]string {
 	return labels.Merge(cr.Spec.PodMetadata.Labels, lbls)
 }
 
-// AllLabels returns combination of selector and managed labels
-func (cr *VLSingle) AllLabels() map[string]string {
-	selectorLabels := cr.SelectorLabels()
-	// fast path
-	if cr.Spec.ManagedMetadata == nil {
-		return selectorLabels
+// FinalLabels returns combination of selector and managed labels
+func (cr *VLSingle) FinalLabels() map[string]string {
+	v := cr.SelectorLabels()
+	if cr.Spec.ManagedMetadata != nil {
+		v = labels.Merge(cr.Spec.ManagedMetadata.Labels, v)
 	}
-
-	return labels.Merge(selectorLabels, cr.Spec.ManagedMetadata.Labels)
+	return v
 }
 
 func (cr *VLSingle) PrefixedName() string {

api/operator/v1/vmanomaly_types.go

@@ -252,16 +252,13 @@ func (cr *VMAnomaly) AsOwner() metav1.OwnerReference {
 	}
 }
 
-// AnnotationsFiltered returns global annotations to be applied for created objects
-func (cr *VMAnomaly) AnnotationsFiltered() map[string]string {
-	if cr.Spec.ManagedMetadata == nil {
-		return nil
-	}
-	dst := make(map[string]string, len(cr.Spec.ManagedMetadata.Annotations))
-	for k, v := range cr.Spec.ManagedMetadata.Annotations {
-		dst[k] = v
+// FinalAnnotations returns global annotations to be applied for created objects
+func (cr *VMAnomaly) FinalAnnotations() map[string]string {
+	var v map[string]string
+	if cr.Spec.ManagedMetadata != nil {
+		v = labels.Merge(cr.Spec.ManagedMetadata.Annotations, v)
 	}
-	return dst
+	return v
 }
 
 // PodAnnotations returns annotations to be applied to Pod
@@ -309,18 +306,13 @@ func (cr *VMAnomaly) PodLabels() map[string]string {
 	return labels.Merge(cr.Spec.PodMetadata.Labels, lbls)
 }
 
-// AllLabels returns global labels to be applied for created objects
-func (cr *VMAnomaly) AllLabels() map[string]string {
-	selectorLabels := cr.SelectorLabels()
-	// fast path
-	if cr.Labels == nil && cr.Spec.ManagedMetadata == nil {
-		return selectorLabels
-	}
-	var result map[string]string
+// FinalLabels returns global labels to be applied for created objects
+func (cr *VMAnomaly) FinalLabels() map[string]string {
+	v := cr.SelectorLabels()
 	if cr.Spec.ManagedMetadata != nil {
-		result = labels.Merge(result, cr.Spec.ManagedMetadata.Labels)
+		v = labels.Merge(cr.Spec.ManagedMetadata.Labels, v)
 	}
-	return labels.Merge(result, selectorLabels)
+	return v
 }
 
 // PrefixedName format name of the component with hard-coded prefix

api/operator/v1/vtcluster_types.go

@@ -163,10 +163,11 @@ func (cr *VTCluster) PodAnnotations(kind vmv1beta1.ClusterComponent) map[string]
 
 // FinalAnnotations returns global annotations to be applied by objects generate for vtcluster
 func (cr *VTCluster) FinalAnnotations() map[string]string {
-	if cr.Spec.ManagedMetadata == nil {
-		return nil
+	var v map[string]string
+	if cr.Spec.ManagedMetadata != nil {
+		v = labels.Merge(cr.Spec.ManagedMetadata.Annotations, v)
 	}
-	return cr.Spec.ManagedMetadata.Annotations
+	return v
 }
 
 // PrefixedName returns prefixed name for the given component kind
@@ -181,12 +182,11 @@ func (cr *VTCluster) PrefixedInternalName(kind vmv1beta1.ClusterComponent) strin
 
 // FinalLabels adds cluster labels to the base labels and filters by prefix if needed
 func (cr *VTCluster) FinalLabels(kind vmv1beta1.ClusterComponent) map[string]string {
-	baseLabels := vmv1beta1.AddClusterLabels(cr.SelectorLabels(kind), "vt")
-	if cr.Spec.ManagedMetadata == nil {
-		// fast path
-		return baseLabels
+	v := vmv1beta1.AddClusterLabels(cr.SelectorLabels(kind), "vt")
+	if cr.Spec.ManagedMetadata != nil {
+		v = labels.Merge(cr.Spec.ManagedMetadata.Labels, v)
 	}
-	return labels.Merge(cr.Spec.ManagedMetadata.Labels, baseLabels)
+	return v
 }
 
 // UnmarshalJSON implements json.Unmarshaler interface
@@ -652,11 +652,6 @@ func (cr *VTCluster) AvailableStorageNodeIDs(requestsType string) []int32 {
 	return result
 }
 
-// AnnotationsFiltered implements finalize.crdObject interface
-func (cr *VTCluster) AnnotationsFiltered() map[string]string {
-	return cr.FinalAnnotations()
-}
-
 // LastAppliedSpecAsPatch return last applied cluster spec as patch annotation
 func (cr *VTCluster) LastAppliedSpecAsPatch() (client.Patch, error) {
 	return vmv1beta1.LastAppliedChangesAsPatch(cr.Spec)

api/operator/v1/vtsingle_types.go

@@ -231,16 +231,13 @@ func (cr *VTSingle) ProbeNeedLiveness() bool {
 	return false
 }
 
-// AnnotationsFiltered returns global annotations to be applied for created objects
-func (cr *VTSingle) AnnotationsFiltered() map[string]string {
-	if cr.Spec.ManagedMetadata == nil {
-		return nil
-	}
-	dst := make(map[string]string, len(cr.Spec.ManagedMetadata.Annotations))
-	for k, v := range cr.Spec.ManagedMetadata.Annotations {
-		dst[k] = v
+// FinalAnnotations returns annotations to be applied for created objects
+func (cr *VTSingle) FinalAnnotations() map[string]string {
+	var v map[string]string
+	if cr.Spec.ManagedMetadata != nil {
+		v = labels.Merge(cr.Spec.ManagedMetadata.Annotations, v)
 	}
-	return dst
+	return v
 }
 
 // SelectorLabels returns unique labels for object
@@ -262,15 +259,13 @@ func (cr *VTSingle) PodLabels() map[string]string {
 	return labels.Merge(cr.Spec.PodMetadata.Labels, lbls)
 }
 
-// AllLabels returns combination of selector and managed labels
-func (cr *VTSingle) AllLabels() map[string]string {
-	selectorLabels := cr.SelectorLabels()
-	// fast path
-	if cr.Spec.ManagedMetadata == nil {
-		return selectorLabels
+// FinalLabels returns combination of selector and managed labels
+func (cr *VTSingle) FinalLabels() map[string]string {
+	v := cr.SelectorLabels()
+	if cr.Spec.ManagedMetadata != nil {
+		v = labels.Merge(cr.Spec.ManagedMetadata.Labels, v)
 	}
-
-	return labels.Merge(selectorLabels, cr.Spec.ManagedMetadata.Labels)
+	return v
 }
 
 // PrefixedName format name of the component with hard-coded prefix

api/operator/v1beta1/vlogs_types.go

@@ -217,20 +217,6 @@ func (cr *VLogs) ProbeNeedLiveness() bool {
 	return false
 }
 
-func (cr *VLogs) AnnotationsFiltered() map[string]string {
-	// TODO: @f41gh7 deprecated at will be removed at v0.52.0 release
-	dst := filterMapKeysByPrefixes(cr.Annotations, annotationFilterPrefixes)
-	if cr.Spec.ManagedMetadata != nil {
-		if dst == nil {
-			dst = make(map[string]string)
-		}
-		for k, v := range cr.Spec.ManagedMetadata.Annotations {
-			dst[k] = v
-		}
-	}
-	return dst
-}
-
 func (cr *VLogs) SelectorLabels() map[string]string {
 	return map[string]string{
 		"app.kubernetes.io/name":      "vlogs",
@@ -248,21 +234,22 @@ func (cr *VLogs) PodLabels() map[string]string {
 	return labels.Merge(cr.Spec.PodMetadata.Labels, lbls)
 }
 
-func (cr *VLogs) AllLabels() map[string]string {
-	selectorLabels := cr.SelectorLabels()
-	// fast path
-	if cr.Labels == nil && cr.Spec.ManagedMetadata == nil {
-		return selectorLabels
-	}
-	var result map[string]string
-	// TODO: @f41gh7 deprecated at will be removed at v0.52.0 release
-	if cr.Labels != nil {
-		result = filterMapKeysByPrefixes(cr.Labels, labelFilterPrefixes)
+// FinalLabels returns combination of selector and managed labels
+func (cr *VLogs) FinalLabels() map[string]string {
+	v := cr.SelectorLabels()
+	if cr.Spec.ManagedMetadata != nil {
+		v = labels.Merge(cr.Spec.ManagedMetadata.Labels, v)
 	}
+	return v
+}
+
+// FinalAnnotations returns annotations to be applied for created objects
+func (cr *VLogs) FinalAnnotations() map[string]string {
+	var v map[string]string
 	if cr.Spec.ManagedMetadata != nil {
-		result = labels.Merge(result, cr.Spec.ManagedMetadata.Labels)
+		v = labels.Merge(cr.Spec.ManagedMetadata.Annotations, v)
 	}
-	return labels.Merge(result, selectorLabels)
+	return v
 }
 
 func (cr *VLogs) PrefixedName() string {