[usage] Add server address to config

Author: easyCZ

components/usage/pkg/server/server.go

@@ -43,6 +43,9 @@ type Config struct {
 
 	// StripePrices configure which Stripe Price IDs should be used
 	StripePrices stripe.StripePrices `json:"stripePrices"`
+
+	// Where to find the gRPC/Connect APIs on the server component
+	ServerAddress string `json:"serverAddress"`
 }
 
 func Start(cfg Config, version string) error {

install/installer/pkg/common/constants.go

@@ -40,6 +40,7 @@ const (
 	ServerComponent                 = "server"
 	ServerIAMSessionPort            = 9876
 	ServerInstallationAdminPort     = 9000
+	ServerGRPCAPIPort               = 9877
 	SystemNodeCritical              = "system-node-critical"
 	PaymentEndpointComponent        = "payment-endpoint"
 	PublicApiComponent              = "public-api-server"

install/installer/pkg/common/net.go

@@ -6,6 +6,8 @@ package common
 
 import (
 	"fmt"
+	"net"
+	"strconv"
 
 	"github.com/gitpod-io/gitpod/common-go/baseserver"
 )
@@ -25,3 +27,11 @@ func LocalhostPrometheusAddr() string {
 func LocalhostPprofAddr() string {
 	return LocalhostAddressFromPort(baseserver.BuiltinDebugPort)
 }
+
+func ClusterAddress(serviceName string, namespace string, port int) string {
+	return net.JoinHostPort(fmt.Sprintf("%s.%s.svc.cluster.local", serviceName, namespace), strconv.Itoa(port))
+}
+
+func ClusterURL(protocol string, serviceName string, namespace string, port int) string {
+	return fmt.Sprintf("%s://%s", protocol, ClusterAddress(serviceName, namespace, port))
+}

install/installer/pkg/components/public-api-server/configmap.go

@@ -6,8 +6,6 @@ package public_api_server
 
 import (
 	"fmt"
-	"net"
-	"strconv"
 
 	"github.com/gitpod-io/gitpod/installer/pkg/config/v1/experimental"
 	"k8s.io/utils/pointer"
@@ -52,15 +50,15 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 
 	cfg := config.Configuration{
 		PublicURL:                         fmt.Sprintf("https://api.%s", ctx.Config.Domain),
-		GitpodServiceURL:                  fmt.Sprintf("ws://%s.%s.svc.cluster.local:%d", server.Component, ctx.Namespace, server.ContainerPort),
+		GitpodServiceURL:                  common.ClusterURL("ws", server.Component, ctx.Namespace, server.ContainerPort),
 		OIDCClientJWTSigningSecretPath:    oidcClientJWTSigningSecretPath,
 		StripeWebhookSigningSecretPath:    stripeSecretPath,
 		PersonalAccessTokenSigningKeyPath: personalAccessTokenSigningKeyPath,
-		BillingServiceAddress:             net.JoinHostPort(fmt.Sprintf("%s.%s.svc.cluster.local", usage.Component, ctx.Namespace), strconv.Itoa(usage.GRPCServicePort)),
-		SessionServiceAddress:             net.JoinHostPort(fmt.Sprintf("%s.%s.svc.cluster.local", common.ServerComponent, ctx.Namespace), strconv.Itoa(common.ServerIAMSessionPort)),
+		BillingServiceAddress:             common.ClusterAddress(usage.Component, ctx.Namespace, usage.GRPCServicePort),
+		SessionServiceAddress:             common.ClusterAddress(common.ServerComponent, ctx.Namespace, common.ServerIAMSessionPort),
 		DatabaseConfigPath:                databaseSecretMountPath,
 		Redis: config.RedisConfiguration{
-			Address: fmt.Sprintf("%s:%d", redis.Component, redis.Port),
+			Address: common.ClusterAddress(redis.Component, ctx.Namespace, redis.Port),
 		},
 		Server: &baseserver.Configuration{
 			Services: baseserver.ServicesConfiguration{

install/installer/pkg/components/server/configmap.go

@@ -6,9 +6,7 @@ package server
 
 import (
 	"fmt"
-	"net"
 	"path/filepath"
-	"strconv"
 	"strings"
 
 	"github.com/gitpod-io/gitpod/installer/pkg/common"
@@ -273,9 +271,9 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 				"shareSnapshot":    {Group: "inWorkspaceUserAction"},
 			},
 		},
-		ContentServiceAddr:           net.JoinHostPort(fmt.Sprintf("%s.%s.svc.cluster.local", contentservice.Component, ctx.Namespace), strconv.Itoa(contentservice.RPCPort)),
-		UsageServiceAddr:             net.JoinHostPort(fmt.Sprintf("%s.%s.svc.cluster.local", usage.Component, ctx.Namespace), strconv.Itoa(usage.GRPCServicePort)),
-		IDEServiceAddr:               net.JoinHostPort(fmt.Sprintf("%s.%s.svc.cluster.local", ideservice.Component, ctx.Namespace), strconv.Itoa(ideservice.GRPCServicePort)),
+		ContentServiceAddr:           common.ClusterAddress(contentservice.Component, ctx.Namespace, contentservice.RPCPort),
+		UsageServiceAddr:             common.ClusterAddress(usage.Component, ctx.Namespace, usage.GRPCServicePort),
+		IDEServiceAddr:               common.ClusterAddress(ideservice.Component, ctx.Namespace, ideservice.GRPCServicePort),
 		MaximumEventLoopLag:          0.35,
 		CodeSync:                     CodeSync{},
 		VSXRegistryUrl:               fmt.Sprintf("https://open-vsx.%s", ctx.Config.Domain), // todo(sje): or "https://{{ .Values.vsxRegistry.host | default "open-vsx.org" }}" if not using OpenVSX proxy

install/installer/pkg/components/server/constants.go

@@ -31,5 +31,5 @@ const (
 	AdminCredentialsSecretKey       = "admin.json"
 
 	GRPCAPIName = "grpc"
-	GRPCAPIPort = 9877
+	GRPCAPIPort = common.ServerGRPCAPIPort
 )

install/installer/pkg/components/usage/configmap.go

@@ -37,6 +37,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 			ForUsers:            1_000_000_000,
 			MinForUsersOnStripe: 0,
 		},
+		ServerAddress: common.ClusterAddress(common.ServerComponent, ctx.Namespace, common.ServerGRPCAPIPort),
 	}
 
 	expWebAppConfig := common.ExperimentalWebappConfig(ctx)