fix nodeset labels

Author: kobzonega

internal/resources/database_statefulset.go

@@ -92,8 +92,8 @@ func (b *DatabaseStatefulSetBuilder) buildPodTemplateLabels() labels.Labels {
 	podTemplateLabels := labels.Labels{}
 
 	podTemplateLabels.Merge(b.Labels)
-	podTemplateLabels.Merge(b.Spec.AdditionalPodLabels)
 	podTemplateLabels.Merge(map[string]string{labels.StatefulsetComponent: b.Name})
+	podTemplateLabels.Merge(b.Spec.AdditionalPodLabels)
 
 	return podTemplateLabels
 }

internal/resources/databasenodeset.go

@@ -55,7 +55,7 @@ func (b *DatabaseNodeSetBuilder) Placeholder(cr client.Object) client.Object {
 }
 
 func (b *DatabaseNodeSetResource) buildLabels() labels.Labels {
-	l := labels.Common(b.Name, b.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 {
@@ -70,12 +70,9 @@ func (b *DatabaseNodeSetResource) buildLabels() labels.Labels {
 
 func (b *DatabaseNodeSetResource) GetResourceBuilders(restConfig *rest.Config) []ResourceBuilder {
 	ydbCr := api.RecastDatabaseNodeSet(b.Unwrap())
-	databaseNodeSetLabels := b.buildLabels()
-
 	statefulSetName := b.Name
-	statefulSetLabels := databaseNodeSetLabels.Copy()
-	statefulSetLabels.Merge(map[string]string{labels.StatefulsetComponent: statefulSetName})
 
+	statefulSetLabels := b.buildLabels()
 	statefulSetAnnotations := CopyDict(b.Spec.AdditionalAnnotations)
 	statefulSetAnnotations[annotations.ConfigurationChecksum] = GetConfigurationChecksum(b.Spec.Configuration)
 

internal/resources/storage_statefulset.go

@@ -107,8 +107,8 @@ func (b *StorageStatefulSetBuilder) buildPodTemplateLabels() labels.Labels {
 	podTemplateLabels := labels.Labels{}
 
 	podTemplateLabels.Merge(b.Labels)
-	podTemplateLabels.Merge(b.Spec.AdditionalPodLabels)
 	podTemplateLabels.Merge(map[string]string{labels.StatefulsetComponent: b.Name})
+	podTemplateLabels.Merge(b.Spec.AdditionalPodLabels)
 
 	return podTemplateLabels
 }

internal/resources/storagenodeset.go

@@ -55,9 +55,9 @@ func (b *StorageNodeSetBuilder) Placeholder(cr client.Object) client.Object {
 }
 
 func (b *StorageNodeSetResource) buildLabels() labels.Labels {
-	l := labels.Common(b.Name, b.Labels)
+	l := labels.Common(b.Spec.StorageRef.Name, b.Labels)
 	l.Merge(b.Spec.AdditionalLabels)
-	l.Merge(map[string]string{labels.ComponentKey: labels.DynamicComponent})
+	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})
 	}
@@ -70,12 +70,9 @@ func (b *StorageNodeSetResource) buildLabels() labels.Labels {
 
 func (b *StorageNodeSetResource) GetResourceBuilders(restConfig *rest.Config) []ResourceBuilder {
 	ydbCr := api.RecastStorageNodeSet(b.Unwrap())
-	storageNodeSetLabels := b.buildLabels()
 
 	statefulSetName := b.Name
-	statefulSetLabels := storageNodeSetLabels.Copy()
-	statefulSetLabels.Merge(map[string]string{labels.StatefulsetComponent: statefulSetName})
-
+	statefulSetLabels := b.buildLabels()
 	statefulSetAnnotations := CopyDict(b.Spec.AdditionalAnnotations)
 	statefulSetAnnotations[annotations.ConfigurationChecksum] = GetConfigurationChecksum(b.Spec.Configuration)