use .spec.nodeName as fqdn if NodePort uses

Author: kobzonega

internal/controllers/database/controller_test.go

@@ -351,7 +351,7 @@ var _ = Describe("Database controller medium tests", func() {
 		By("Check that args `--grpc-public-host` and `--grpc-public-port` propagated to StatefulSet pods...")
 		publicHost := fmt.Sprintf(v1alpha1.InterconnectServiceFQDNFormat, testobjects.DatabaseName, testobjects.YdbNamespace, v1alpha1.DefaultDomainName)
 		Eventually(
-			checkPublicArgs(fmt.Sprintf("%s.%s", "$(NODE_NAME)", publicHost), fmt.Sprintf("%d", v1alpha1.GRPCPort)),
+			checkPublicArgs(fmt.Sprintf("%s.%s", "$(POD_NAME)", publicHost), fmt.Sprintf("%d", v1alpha1.GRPCPort)),
 			test.Timeout,
 			test.Interval).ShouldNot(HaveOccurred())
 
@@ -396,7 +396,7 @@ var _ = Describe("Database controller medium tests", func() {
 
 		By("Check that args `--grpc-public-host` and `--grpc-public-port` was updated in StatefulSet...")
 		Eventually(
-			checkPublicArgs(fmt.Sprintf("%s.%s", "$(NODE_NAME)", externalHost), fmt.Sprintf("%d", externalPort)),
+			checkPublicArgs(fmt.Sprintf("%s.%s", "$(POD_NAME)", externalHost), fmt.Sprintf("%d", externalPort)),
 			test.Timeout,
 			test.Interval).ShouldNot(HaveOccurred())
 	})

internal/resources/database_statefulset.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"log"
 	"regexp"
+	"strings"
 
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -76,14 +77,23 @@ func (b *DatabaseStatefulSetBuilder) buildEnv() []corev1.EnvVar {
 
 	envVars = append(envVars,
 		corev1.EnvVar{
-			Name: "NODE_NAME", // for `--grpc-public-host` flag
+			Name: "POD_NAME", // for `--grpc-public-host` flag
 			ValueFrom: &corev1.EnvVarSource{
 				FieldRef: &corev1.ObjectFieldSelector{
 					APIVersion: "v1",
 					FieldPath:  "metadata.name",
 				},
 			},
 		},
+		corev1.EnvVar{
+			Name: "NODE_NAME", // for `--grpc-public-port` flag
+			ValueFrom: &corev1.EnvVarSource{
+				FieldRef: &corev1.ObjectFieldSelector{
+					APIVersion: "v1",
+					FieldPath:  "spec.nodeName",
+				},
+			},
+		},
 		corev1.EnvVar{
 			Name: "POD_IP", // for `--grpc-public-address-<ip-family>` flag
 			ValueFrom: &corev1.EnvVarSource{
@@ -643,10 +653,13 @@ func (b *DatabaseStatefulSetBuilder) buildContainerArgs() ([]string, []string) {
 	}
 
 	publicHostOption := "--grpc-public-host"
-	publicHost := fmt.Sprintf(api.InterconnectServiceFQDNFormat, b.Database.Name, b.GetNamespace(), domain) // FIXME .svc.cluster.local
-
+	publicHostDomain := fmt.Sprintf(api.InterconnectServiceFQDNFormat, b.Database.Name, b.GetNamespace(), domain)
+	publicHost := fmt.Sprintf("%s.%s", "$(POD_NAME)", publicHostDomain)
 	if b.Spec.Service.GRPC.ExternalHost != "" {
-		publicHost = b.Spec.Service.GRPC.ExternalHost
+		publicHost = fmt.Sprintf("%s.%s", "$(POD_NAME)", b.Spec.Service.GRPC.ExternalHost)
+	}
+	if b.Spec.Service.GRPC.ExternalPort > 0 {
+		publicHost = "$(NODE_NAME)"
 	}
 	if value, ok := b.ObjectMeta.Annotations[api.AnnotationGRPCPublicHost]; ok {
 		publicHost = value
@@ -670,7 +683,7 @@ func (b *DatabaseStatefulSetBuilder) buildContainerArgs() ([]string, []string) {
 			args = append(
 				args,
 				"--grpc-public-target-name-override",
-				fmt.Sprintf("%s.%s", "$(NODE_NAME)", targetNameOverride),
+				fmt.Sprintf("%s.%s", "$(POD_NAME)", targetNameOverride),
 			)
 		}
 	}
@@ -688,7 +701,7 @@ func (b *DatabaseStatefulSetBuilder) buildContainerArgs() ([]string, []string) {
 		args,
 
 		publicHostOption,
-		fmt.Sprintf("%s.%s", "$(NODE_NAME)", publicHost), // fixme $(NODE_NAME)
+		publicHost,
 
 		publicPortOption,
 		publicPort,
@@ -704,6 +717,9 @@ func (b *DatabaseStatefulSetBuilder) buildContainerArgs() ([]string, []string) {
 	}
 
 	if value, ok := b.ObjectMeta.Annotations[api.AnnotationNodeHost]; ok {
+		if !strings.HasPrefix(value, "$(POD_NAME).") {
+			value = fmt.Sprintf("%s.%s", "$(POD_NAME)", value)
+		}
 		args = append(args,
 			"--node-host",
 			value,

tests/cfg/operator-local-values.yaml

@@ -1,3 +1,8 @@
+image:
+  pullPolicy: IfNotPresent
+  repository: kind/ydb-operator
+  tag: current
+
 webhook:
   enabled: true