fixes

Author: kobzonega

api/v1alpha1/const.go

@@ -49,6 +49,7 @@ const (
 	AnnotationDataCenter             = "ydb.tech/data-center"
 	AnnotationGRPCPublicHost         = "ydb.tech/grpc-public-host"
 	AnnotationNodeHost               = "ydb.tech/node-host"
+	AnnotationNodeDomain             = "ydb.tech/node-domain"
 
 	AnnotationValueTrue = "true"
 

api/v1alpha1/database_webhook.go

@@ -14,7 +14,6 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
-	"github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
 	. "github.com/ydb-platform/ydb-kubernetes-operator/internal/controllers/constants" //nolint:revive,stylecheck
 )
 
@@ -158,11 +157,6 @@ func (r *DatabaseDefaulter) Default(ctx context.Context, obj runtime.Object) err
 		database.Spec.Configuration = string(configuration)
 	}
 
-	if database.Spec.AdditionalAnnotations == nil {
-		database.Spec.AdditionalAnnotations = make(map[string]string)
-	}
-	database.Spec.AdditionalAnnotations[annotations.ConfigurationChecksum] = annotations.GetSHA256Checksum(database.Spec.Configuration)
-
 	return nil
 }
 

api/v1alpha1/storage_webhook.go

@@ -16,7 +16,6 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
-	"github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
 	"github.com/ydb-platform/ydb-kubernetes-operator/internal/configuration/schema"
 	. "github.com/ydb-platform/ydb-kubernetes-operator/internal/controllers/constants" //nolint:revive,stylecheck
 )
@@ -169,11 +168,6 @@ func (r *StorageDefaulter) Default(ctx context.Context, obj runtime.Object) erro
 	}
 	storage.Spec.Configuration = string(configuration)
 
-	if storage.Spec.AdditionalAnnotations == nil {
-		storage.Spec.AdditionalAnnotations = make(map[string]string)
-	}
-	storage.Spec.AdditionalAnnotations[annotations.ConfigurationChecksum] = annotations.GetSHA256Checksum(storage.Spec.Configuration)
-
 	return nil
 }
 

internal/annotations/annotations.go

@@ -1,10 +1,6 @@
 package annotations
 
-import (
-	"crypto/sha256"
-	"encoding/hex"
-	"strings"
-)
+import "strings"
 
 const (
 	PrimaryResourceStorageAnnotation  = "ydb.tech/primary-resource-storage"
@@ -57,9 +53,3 @@ func CompareLastAppliedAnnotation(map1, map2 map[string]string) bool {
 	value2 := GetLastAppliedAnnotation(map2)
 	return value1 == value2
 }
-
-func GetSHA256Checksum(text string) string {
-	hasher := sha256.New()
-	hasher.Write([]byte(text))
-	return hex.EncodeToString(hasher.Sum(nil))
-}

internal/controllers/storage/controller_test.go

@@ -12,12 +12,15 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
 	"github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
 	testobjects "github.com/ydb-platform/ydb-kubernetes-operator/e2e/tests/test-objects"
+	"github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
 	"github.com/ydb-platform/ydb-kubernetes-operator/internal/controllers/storage"
+	"github.com/ydb-platform/ydb-kubernetes-operator/internal/resources"
 	"github.com/ydb-platform/ydb-kubernetes-operator/internal/test"
 )
 
@@ -53,6 +56,10 @@ var _ = Describe("Storage controller medium tests", func() {
 		Expect(k8sClient.Create(ctx, &namespace)).Should(Succeed())
 	})
 
+	AfterEach(func() {
+		Expect(k8sClient.Delete(ctx, &namespace)).Should(Succeed())
+	})
+
 	It("Checking field propagation to objects", func() {
 		storageSample := testobjects.DefaultStorage(filepath.Join("..", "..", "..", "e2e", "tests", "data", "storage-block-4-2-config.yaml"))
 
@@ -105,6 +112,22 @@ var _ = Describe("Storage controller medium tests", func() {
 		}
 		Expect(foundVolume).To(BeTrue())
 
+		By("Check that annotation propagated to pods...", func() {
+			podAnnotations := storageSS.Spec.Template.Annotations
+
+			foundStorage := v1alpha1.Storage{}
+			Expect(k8sClient.Get(ctx, types.NamespacedName{
+				Name:      testobjects.StorageName,
+				Namespace: testobjects.YdbNamespace,
+			}, &foundStorage)).Should(Succeed())
+
+			foundConfigurationChecksumAnnotation := false
+			if podAnnotations[annotations.ConfigurationChecksum] == resources.GetSHA256Checksum(foundStorage.Spec.Configuration) {
+				foundConfigurationChecksumAnnotation = true
+			}
+			Expect(foundConfigurationChecksumAnnotation).To(BeTrue())
+		})
+
 		By("Check that args with --label propagated to pods...", func() {
 			podContainerArgs := storageSS.Spec.Template.Spec.Containers[0].Args
 			var labelArgKey string

internal/resources/database.go

@@ -31,25 +31,34 @@ func (b *DatabaseBuilder) Unwrap() *api.Database {
 	return b.DeepCopy()
 }
 
-func DatabaseLabels(database *api.Database) labels.Labels {
-	l := labels.Common(database.Name, database.Labels)
+func (b *DatabaseBuilder) NewLabels() labels.Labels {
+	l := labels.Common(b.Name, b.Labels)
 
-	l.Merge(database.Spec.AdditionalLabels)
-	l.Merge(map[string]string{
-		labels.ComponentKey: labels.DynamicComponent,
-	})
+	l.Merge(b.Spec.AdditionalLabels)
+	l.Merge(map[string]string{labels.ComponentKey: labels.DynamicComponent})
 
 	return l
 }
 
+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
+	}
+
+	return an
+}
+
 func (b *DatabaseBuilder) GetResourceBuilders(restConfig *rest.Config) []ResourceBuilder {
 	if b.Spec.ServerlessResources != nil {
 		return []ResourceBuilder{}
 	}
 
-	databaseLabels := DatabaseLabels(b.Unwrap())
-	databaseAnnotations := annotations.GetYdbTechAnnotations(b.Annotations)
-	delete(databaseAnnotations, annotations.LastAppliedAnnotation)
+	databaseLabels := b.NewLabels()
+	databaseAnnotations := b.NewAnnotations()
 
 	grpcServiceLabels := databaseLabels.Copy()
 	grpcServiceLabels.Merge(b.Spec.Service.GRPC.AdditionalLabels)
@@ -67,11 +76,6 @@ func (b *DatabaseBuilder) GetResourceBuilders(restConfig *rest.Config) []Resourc
 	datastreamsServiceLabels.Merge(b.Spec.Service.Datastreams.AdditionalLabels)
 	datastreamsServiceLabels.Merge(map[string]string{labels.ServiceComponent: labels.DatastreamsComponent})
 
-	statefulSetAnnotations := CopyDict(databaseAnnotations)
-	for k, v := range b.Spec.AdditionalAnnotations {
-		statefulSetAnnotations[k] = v
-	}
-
 	var optionalBuilders []ResourceBuilder
 
 	if b.Spec.Configuration != "" {
@@ -197,7 +201,7 @@ func (b *DatabaseBuilder) GetResourceBuilders(restConfig *rest.Config) []Resourc
 
 				Name:        b.Name,
 				Labels:      databaseLabels,
-				Annotations: statefulSetAnnotations,
+				Annotations: databaseAnnotations,
 			},
 		)
 	} else {
@@ -221,6 +225,8 @@ func (b *DatabaseBuilder) getNodeSetBuilders(
 
 		nodeSetLabels := databaseLabels.Copy()
 		nodeSetLabels.Merge(nodeSetSpecInline.Labels)
+
+		nodeSetLabels[labels.DatabaseNodeSetComponent] = nodeSetSpecInline.Name
 		if nodeSetSpecInline.Remote != nil {
 			nodeSetLabels[labels.RemoteClusterKey] = nodeSetSpecInline.Remote.Cluster
 		}
@@ -230,7 +236,7 @@ func (b *DatabaseBuilder) getNodeSetBuilders(
 			nodeSetAnnotations[k] = v
 		}
 
-		databaseNodeSetSpec := b.recastDatabaseNodeSetSpecInline(nodeSetSpecInline.DeepCopy())
+		nodeSetSpec := b.recastDatabaseNodeSetSpecInline(nodeSetSpecInline.DeepCopy())
 
 		if nodeSetSpecInline.Remote != nil {
 			nodeSetBuilders = append(
@@ -242,7 +248,7 @@ func (b *DatabaseBuilder) getNodeSetBuilders(
 					Labels:      nodeSetLabels,
 					Annotations: nodeSetAnnotations,
 
-					DatabaseNodeSetSpec: databaseNodeSetSpec,
+					DatabaseNodeSetSpec: nodeSetSpec,
 				},
 			)
 		} else {
@@ -255,7 +261,7 @@ func (b *DatabaseBuilder) getNodeSetBuilders(
 					Labels:      nodeSetLabels,
 					Annotations: nodeSetAnnotations,
 
-					DatabaseNodeSetSpec: databaseNodeSetSpec,
+					DatabaseNodeSetSpec: nodeSetSpec,
 				},
 			)
 		}
@@ -297,15 +303,14 @@ func (b *DatabaseBuilder) recastDatabaseNodeSetSpecInline(nodeSetSpecInline *api
 	}
 
 	if nodeSetSpecInline.TopologySpreadConstraints != nil {
-		nodeSetSpec.TopologySpreadConstraints = append([]corev1.TopologySpreadConstraint{}, nodeSetSpecInline.TopologySpreadConstraints...)
+		nodeSetSpec.TopologySpreadConstraints = nodeSetSpecInline.TopologySpreadConstraints
 	}
 
 	if nodeSetSpecInline.Tolerations != nil {
 		nodeSetSpec.Tolerations = append(nodeSetSpec.Tolerations, nodeSetSpecInline.Tolerations...)
 	}
 
 	nodeSetSpec.AdditionalLabels = CopyDict(b.Spec.AdditionalLabels)
-	nodeSetSpec.AdditionalLabels[labels.DatabaseNodeSetComponent] = nodeSetSpecInline.Name
 	if nodeSetSpecInline.AdditionalLabels != nil {
 		for k, v := range nodeSetSpecInline.AdditionalLabels {
 			nodeSetSpec.AdditionalLabels[k] = v

internal/resources/database_statefulset.go

@@ -645,13 +645,19 @@ func (b *DatabaseStatefulSetBuilder) buildContainerArgs() ([]string, []string) {
 	}
 
 	if value, ok := b.ObjectMeta.Annotations[api.AnnotationNodeHost]; ok {
-		nodeHost := value
-		if !strings.HasPrefix(nodeHost, "$(NODE_NAME).") {
-			nodeHost = fmt.Sprintf("%s.%s", "$(NODE_NAME)", nodeHost)
+		if !strings.HasPrefix(value, "$(NODE_NAME).") {
+			value = fmt.Sprintf("%s.%s", "$(NODE_NAME)", value)
 		}
 		args = append(args,
 			"--node-host",
-			nodeHost,
+			value,
+		)
+	}
+
+	if value, ok := b.ObjectMeta.Annotations[api.AnnotationNodeDomain]; ok {
+		args = append(args,
+			"--node-domain",
+			value,
 		)
 	}
 

internal/resources/databasenodeset.go

@@ -8,7 +8,6 @@ import (
 	"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"
 )
 
 type DatabaseNodeSetBuilder struct {
@@ -56,24 +55,20 @@ func (b *DatabaseNodeSetBuilder) Placeholder(cr client.Object) client.Object {
 func (b *DatabaseNodeSetResource) GetResourceBuilders(restConfig *rest.Config) []ResourceBuilder {
 	var resourceBuilders []ResourceBuilder
 
-	database := api.RecastDatabaseNodeSet(b.DatabaseNodeSet)
-	databaseLabels := DatabaseLabels(database)
+	ydbCr := api.RecastDatabaseNodeSet(b.DatabaseNodeSet)
 
-	databaseAnnotations := annotations.GetYdbTechAnnotations(b.Annotations)
-	delete(databaseAnnotations, annotations.LastAppliedAnnotation)
-	statefulSetAnnotations := CopyDict(databaseAnnotations)
-	for k, v := range b.Spec.AdditionalAnnotations {
-		statefulSetAnnotations[k] = v
-	}
+	database := NewDatabase(ydbCr)
+	databaseLabels := database.NewLabels()
+	databaseAnnotations := database.NewAnnotations()
 
 	resourceBuilders = append(resourceBuilders,
 		&DatabaseStatefulSetBuilder{
-			Database:   database,
+			Database:   ydbCr,
 			RestConfig: restConfig,
 
 			Name:        b.Name,
 			Labels:      databaseLabels,
-			Annotations: statefulSetAnnotations,
+			Annotations: databaseAnnotations,
 		},
 	)
 	return resourceBuilders

internal/resources/resource.go

@@ -2,6 +2,8 @@ package resources
 
 import (
 	"context"
+	"crypto/sha256"
+	"encoding/hex"
 	"errors"
 	"fmt"
 
@@ -610,6 +612,12 @@ func buildCAStorePatchingCommandArgs(
 	return command, args
 }
 
+func GetSHA256Checksum(text string) string {
+	hasher := sha256.New()
+	hasher.Write([]byte(text))
+	return hex.EncodeToString(hasher.Sum(nil))
+}
+
 func isSignAlgorithmSupported(alg string) bool {
 	supportedAlgs := jwt.GetAlgorithms()