externalPort override publicHost with

Author: kobzonega

internal/resources/database.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/client-go/rest"
 
 	api "github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
@@ -153,10 +152,9 @@ func (b *DatabaseBuilder) GetResourceBuilders(restConfig *rest.Config) []Resourc
 			SelectorLabels: databaseLabels,
 			Annotations:    b.Spec.Service.GRPC.AdditionalAnnotations,
 			Ports: []corev1.ServicePort{{
-				Name:       api.GRPCServicePortName,
-				Port:       api.GRPCPort,
-				TargetPort: intstr.IntOrString{Type: intstr.String, StrVal: "grpc"},
-				NodePort:   b.Spec.Service.GRPC.ExternalPort,
+				Name:     api.GRPCServicePortName,
+				Port:     api.GRPCPort,
+				NodePort: b.Spec.Service.GRPC.ExternalPort,
 			}},
 			IPFamilies:     b.Spec.Service.GRPC.IPFamilies,
 			IPFamilyPolicy: b.Spec.Service.GRPC.IPFamilyPolicy,

internal/resources/database_statefulset.go

@@ -437,15 +437,8 @@ func (b *DatabaseStatefulSetBuilder) buildContainer() corev1.Container {
 		}
 	}
 
-	var grpcPublicPort int32
-	if b.Spec.Service.GRPC.ExternalPort != 0 {
-		grpcPublicPort = b.Spec.Service.GRPC.ExternalPort
-	} else {
-		grpcPublicPort = api.GRPCPort
-	}
-
 	ports := []corev1.ContainerPort{{
-		Name: "grpc", ContainerPort: grpcPublicPort,
+		Name: "grpc", ContainerPort: api.GRPCPort,
 	}, {
 		Name: "interconnect", ContainerPort: api.InterconnectPort,
 	}, {
@@ -655,12 +648,10 @@ func (b *DatabaseStatefulSetBuilder) buildContainerArgs() ([]string, []string) {
 	publicHostOption := "--grpc-public-host"
 	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 = 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
 	}
@@ -690,10 +681,12 @@ func (b *DatabaseStatefulSetBuilder) buildContainerArgs() ([]string, []string) {
 
 	publicPortOption := "--grpc-public-port"
 	publicPort := fmt.Sprintf("%d", api.GRPCPort)
-	if b.Spec.Service.GRPC.ExternalPort != 0 {
+	if b.Spec.Service.GRPC.ExternalPort > 0 {
+		publicHost = "$(NODE_NAME)"
 		publicPort = fmt.Sprintf("%d", b.Spec.Service.GRPC.ExternalPort)
 	}
 	if value, ok := b.ObjectMeta.Annotations[api.AnnotationGRPCPublicPort]; ok {
+		publicHost = "$(NODE_NAME)"
 		publicPort = value
 	}
 

internal/resources/service.go

@@ -63,7 +63,7 @@ func (b *ServiceBuilder) Build(obj client.Object) error {
 	}
 
 	for _, port := range service.Spec.Ports {
-		if port.NodePort != 0 {
+		if port.NodePort > 0 {
 			service.Spec.Type = corev1.ServiceTypeNodePort
 		}
 	}