use additionalLabels only from initJob

Author: kobzonega

internal/controllers/storage/init.go

@@ -294,7 +294,9 @@ func (r *Reconciler) createInitBlobstorageJob(
 	ctx context.Context,
 	storage *resources.StorageClusterBuilder,
 ) error {
-	builder := storage.GetInitJobBuilder()
+	ydbCr := storage.Unwrap()
+	initJob := resources.NewInitJob(ydbCr)
+	builder := initJob.GetResourceBuilder()
 	newResource := builder.Placeholder(storage)
 	_, err := resources.CreateOrUpdateOrMaybeIgnore(ctx, r.Client, newResource, func() error {
 		var err error

internal/resources/storage.go

@@ -50,34 +50,6 @@ func (b *StorageClusterBuilder) NewAnnotations() map[string]string {
 	return an
 }
 
-func (b *StorageClusterBuilder) GetInitJobBuilder() ResourceBuilder {
-	jobName := fmt.Sprintf(InitJobNameFormat, b.Name)
-	jobLabels := b.NewLabels()
-	jobLabels[labels.ComponentKey] = labels.InitComponent
-	jobAnnotations := b.NewAnnotations()
-
-	if b.Spec.InitJob != nil {
-		if b.Spec.InitJob.AdditionalLabels != nil {
-			for k, v := range b.Spec.InitJob.AdditionalLabels {
-				jobLabels[k] = v
-			}
-		}
-		if b.Spec.InitJob.AdditionalAnnotations != nil {
-			for k, v := range b.Spec.InitJob.AdditionalAnnotations {
-				jobAnnotations[k] = v
-			}
-		}
-	}
-
-	return &StorageInitJobBuilder{
-		Storage: b.Unwrap(),
-
-		Name:        jobName,
-		Labels:      jobLabels,
-		Annotations: jobAnnotations,
-	}
-}
-
 func (b *StorageClusterBuilder) GetResourceBuilders(restConfig *rest.Config) []ResourceBuilder {
 	storageLabels := b.NewLabels()
 	storageAnnotations := b.NewAnnotations()

internal/resources/storage_init_job.go

@@ -11,6 +11,7 @@ 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"
 	"github.com/ydb-platform/ydb-kubernetes-operator/internal/ptr"
 )
 
@@ -23,10 +24,56 @@ type StorageInitJobBuilder struct {
 	Annotations map[string]string
 }
 
+func NewInitJob(ydbCr *api.Storage) StorageInitJobBuilder {
+	cr := ydbCr.DeepCopy()
+
+	return StorageInitJobBuilder{Storage: cr}
+}
+
 func (b *StorageInitJobBuilder) Unwrap() *api.Storage {
 	return b.DeepCopy()
 }
 
+func (b *StorageInitJobBuilder) NewLabels() labels.Labels {
+	l := labels.Common(b.Name, b.Labels)
+
+	if b.Spec.InitJob != nil {
+		l.Merge(b.Spec.InitJob.AdditionalLabels)
+	}
+
+	l.Merge(map[string]string{labels.ComponentKey: labels.InitComponent})
+
+	return l
+}
+
+func (b *StorageInitJobBuilder) NewAnnotations() map[string]string {
+	an := annotations.GetYdbTechAnnotations(b.Annotations)
+
+	if b.Spec.InitJob.AdditionalAnnotations != nil {
+		for k, v := range b.Spec.InitJob.AdditionalAnnotations {
+			an[k] = v
+		}
+	}
+
+	an[annotations.ConfigurationChecksum] = GetSHA256Checksum(b.Spec.Configuration)
+
+	return an
+}
+
+func (b *StorageInitJobBuilder) GetResourceBuilder() ResourceBuilder {
+	jobName := fmt.Sprintf(InitJobNameFormat, b.Name)
+	jobLabels := b.NewLabels()
+	jobAnnotations := b.NewAnnotations()
+
+	return &StorageInitJobBuilder{
+		Storage: b.Unwrap(),
+
+		Name:        jobName,
+		Labels:      jobLabels,
+		Annotations: jobAnnotations,
+	}
+}
+
 func (b *StorageInitJobBuilder) Build(obj client.Object) error {
 	job, ok := obj.(*batchv1.Job)
 	if !ok {