also set --grpc-public-host

Author: nikitka

internal/resources/database_statefulset.go

@@ -632,15 +632,9 @@ func (b *DatabaseStatefulSetBuilder) buildContainerArgs() ([]string, []string) {
 		}
 	}
 
+	publicHostOption := "--grpc-public-host"
 	publicHost := fmt.Sprintf(api.InterconnectServiceFQDNFormat, b.Database.Name, b.GetNamespace()) // FIXME .svc.cluster.local
 
-	if b.Spec.Service.GRPC.ExternalHost != "" {
-		publicHost = b.Spec.Service.GRPC.ExternalHost
-	}
-	if value, ok := b.ObjectMeta.Annotations[api.AnnotationGRPCPublicHost]; ok {
-		publicHost = value
-	}
-
 	if b.Spec.Service.GRPC.IPDiscovery != nil && b.Spec.Service.GRPC.IPDiscovery.Enabled == true {
 
 		ipFamilyArg := "--grpc-public-address-v4"
@@ -658,19 +652,23 @@ func (b *DatabaseStatefulSetBuilder) buildContainerArgs() ([]string, []string) {
 			"$(POD_IP)",
 		)
 	} else {
-		publicHostOption := "--grpc-public-host"
-		args = append(
-			args,
-			publicHostOption,
-			fmt.Sprintf("%s.%s", "$(NODE_NAME)", publicHost), // fixme $(NODE_NAME)
-		)
+		if b.Spec.Service.GRPC.ExternalHost != "" {
+			publicHost = b.Spec.Service.GRPC.ExternalHost
+		}
+		if value, ok := b.ObjectMeta.Annotations[api.AnnotationGRPCPublicHost]; ok {
+			publicHost = value
+		}
 	}
 
 	publicPortOption := "--grpc-public-port"
 	publicPort := api.GRPCPort
 
 	args = append(
 		args,
+
+		publicHostOption,
+		fmt.Sprintf("%s.%s", "$(NODE_NAME)", publicHost), // fixme $(NODE_NAME)
+
 		publicPortOption,
 		strconv.Itoa(publicPort),
 	)