use database and storage builders for statefulset labels in nodeset

Author: kobzonega

internal/labels/label.go

@@ -24,9 +24,6 @@ const (
 	// RemoteClusterKey The specialization of a remote k8s cluster
 	RemoteClusterKey = "ydb.tech/remote-cluster"
 
-	StorageGeneration  = "ydb.tech/storage-generation"
-	DatabaseGeneration = "ydb.tech/database-generation"
-
 	StorageComponent         = "storage-node"
 	DynamicComponent         = "dynamic-node"
 	BlobstorageInitComponent = "blobstorage-init"
@@ -87,5 +84,17 @@ func makeCommonLabels(other map[string]string, instance string) map[string]strin
 
 	common[ManagedByKey] = "ydb-operator"
 
+	if storageNodeSetName, exist := other[StorageNodeSetComponent]; exist {
+		common[StorageNodeSetComponent] = storageNodeSetName
+	}
+
+	if databaseNodeSetName, exist := other[DatabaseNodeSetComponent]; exist {
+		common[DatabaseNodeSetComponent] = databaseNodeSetName
+	}
+
+	if remoteCluster, exist := other[RemoteClusterKey]; exist {
+		common[RemoteClusterKey] = remoteCluster
+	}
+
 	return common
 }

internal/resources/databasenodeset.go

@@ -9,7 +9,6 @@ import (
 
 	api "github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
 	"github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
-	"github.com/ydb-platform/ydb-kubernetes-operator/internal/labels"
 )
 
 type DatabaseNodeSetBuilder struct {
@@ -54,25 +53,12 @@ func (b *DatabaseNodeSetBuilder) Placeholder(cr client.Object) client.Object {
 	}
 }
 
-func (b *DatabaseNodeSetResource) buildLabels() labels.Labels {
-	l := labels.Common(b.Spec.DatabaseRef.Name, b.Labels)
-	l.Merge(b.Spec.AdditionalLabels)
-	l.Merge(map[string]string{labels.ComponentKey: labels.DynamicComponent})
-	if nodeSetName, exist := b.Labels[labels.DatabaseNodeSetComponent]; exist {
-		l.Merge(map[string]string{labels.DatabaseNodeSetComponent: nodeSetName})
-	}
-	if remoteCluster, exist := b.Labels[labels.RemoteClusterKey]; exist {
-		l.Merge(map[string]string{labels.RemoteClusterKey: remoteCluster})
-	}
-
-	return l
-}
-
 func (b *DatabaseNodeSetResource) GetResourceBuilders(restConfig *rest.Config) []ResourceBuilder {
 	ydbCr := api.RecastDatabaseNodeSet(b.Unwrap())
-	statefulSetName := b.Name
+	databaseBuilder := NewDatabase(ydbCr)
 
-	statefulSetLabels := b.buildLabels()
+	statefulSetName := b.Name
+	statefulSetLabels := databaseBuilder.buildLabels()
 	statefulSetAnnotations := CopyDict(b.Spec.AdditionalAnnotations)
 	statefulSetAnnotations[annotations.ConfigurationChecksum] = GetConfigurationChecksum(b.Spec.Configuration)
 

internal/resources/storage_init_job.go

@@ -3,15 +3,13 @@ package resources
 import (
 	"errors"
 	"fmt"
-	"strconv"
 
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	api "github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
-	"github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
 	"github.com/ydb-platform/ydb-kubernetes-operator/internal/labels"
 	"github.com/ydb-platform/ydb-kubernetes-operator/internal/ptr"
 )
@@ -66,11 +64,9 @@ func GetInitJobBuilder(storage *api.Storage) ResourceBuilder {
 	if storage.Spec.InitJob != nil {
 		if storage.Spec.InitJob.AdditionalLabels != nil {
 			jobLabels.Merge(storage.Spec.InitJob.AdditionalLabels)
-			jobLabels[labels.StorageGeneration] = strconv.FormatInt(storage.ObjectMeta.Generation, 10)
 		}
 		if storage.Spec.InitJob.AdditionalAnnotations != nil {
 			jobAnnotations = CopyDict(storage.Spec.InitJob.AdditionalAnnotations)
-			jobAnnotations[annotations.ConfigurationChecksum] = GetConfigurationChecksum(storage.Spec.Configuration)
 		}
 	}
 

internal/resources/storagenodeset.go

@@ -9,7 +9,6 @@ import (
 
 	api "github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
 	"github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
-	"github.com/ydb-platform/ydb-kubernetes-operator/internal/labels"
 )
 
 type StorageNodeSetBuilder struct {
@@ -54,25 +53,12 @@ func (b *StorageNodeSetBuilder) Placeholder(cr client.Object) client.Object {
 	}
 }
 
-func (b *StorageNodeSetResource) buildLabels() labels.Labels {
-	l := labels.Common(b.Spec.StorageRef.Name, b.Labels)
-	l.Merge(b.Spec.AdditionalLabels)
-	l.Merge(map[string]string{labels.ComponentKey: labels.StorageComponent})
-	if nodeSetName, exist := b.Labels[labels.StorageNodeSetComponent]; exist {
-		l.Merge(map[string]string{labels.StorageNodeSetComponent: nodeSetName})
-	}
-	if remoteCluster, exist := b.Labels[labels.RemoteClusterKey]; exist {
-		l.Merge(map[string]string{labels.RemoteClusterKey: remoteCluster})
-	}
-
-	return l
-}
-
 func (b *StorageNodeSetResource) GetResourceBuilders(restConfig *rest.Config) []ResourceBuilder {
 	ydbCr := api.RecastStorageNodeSet(b.Unwrap())
+	clusterBuilder := NewCluster(ydbCr)
 
 	statefulSetName := b.Name
-	statefulSetLabels := b.buildLabels()
+	statefulSetLabels := clusterBuilder.buildLabels()
 	statefulSetAnnotations := CopyDict(b.Spec.AdditionalAnnotations)
 	statefulSetAnnotations[annotations.ConfigurationChecksum] = GetConfigurationChecksum(b.Spec.Configuration)