beautirfy node-host annotation

Author: kobzonega

api/v1alpha1/const.go

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

internal/annotations/annotations.go

@@ -1,6 +1,10 @@
 package annotations
 
-import "strings"
+import (
+	"crypto/sha256"
+	"encoding/hex"
+	"strings"
+)
 
 const (
 	PrimaryResourceStorageAnnotation  = "ydb.tech/primary-resource-storage"
@@ -53,3 +57,9 @@ 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

@@ -22,7 +22,6 @@ import (
 	"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/labels"
-	"github.com/ydb-platform/ydb-kubernetes-operator/internal/resources"
 	"github.com/ydb-platform/ydb-kubernetes-operator/internal/test"
 )
 
@@ -131,7 +130,7 @@ var _ = Describe("Storage controller medium tests", func() {
 			Expect(foundStorageGenerationLabel).To(BeTrue())
 
 			foundConfigurationChecksumAnnotation := false
-			if podAnnotations[annotations.ConfigurationChecksum] == resources.GetConfigurationChecksum(foundStorage.Spec.Configuration) {
+			if podAnnotations[annotations.ConfigurationChecksum] == annotations.GetSHA256Checksum(foundStorage.Spec.Configuration) {
 				foundConfigurationChecksumAnnotation = true
 			}
 			Expect(foundConfigurationChecksumAnnotation).To(BeTrue())

internal/resources/database_statefulset.go

@@ -7,6 +7,7 @@ import (
 	"log"
 	"regexp"
 	"strconv"
+	"strings"
 
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -603,16 +604,13 @@ 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)
+		}
 		args = append(args,
 			"--node-host",
-			value,
-		)
-	}
-
-	if value, ok := b.ObjectMeta.Annotations[api.AnnotationNodeDomain]; ok {
-		args = append(args,
-			"--node-domain",
-			value,
+			nodeHost,
 		)
 	}
 

internal/resources/resource.go

@@ -2,8 +2,6 @@ package resources
 
 import (
 	"context"
-	"crypto/sha256"
-	"encoding/hex"
 	"errors"
 	"fmt"
 
@@ -341,7 +339,7 @@ func EqualRemoteResourceWithObject(
 func LastAppliedAnnotationPredicate() predicate.Predicate {
 	return predicate.Funcs{
 		UpdateFunc: func(e event.UpdateEvent) bool {
-			return !ydbannotations.CompareYdbTechAnnotations(
+			return !ydbannotations.CompareLastAppliedAnnotation(
 				e.ObjectOld.GetAnnotations(),
 				e.ObjectNew.GetAnnotations(),
 			)
@@ -528,9 +526,3 @@ func buildCAStorePatchingCommandArgs(
 
 	return command, args
 }
-
-func GetConfigurationChecksum(configuration string) string {
-	hasher := sha256.New()
-	hasher.Write([]byte(configuration))
-	return hex.EncodeToString(hasher.Sum(nil))
-}