allow default grpc and http port to be overridden by envvars

Author: kqdeng

deploy/docker-compose.yml

@@ -15,6 +15,8 @@ services:
       PGPORT: 5432
       PGSSLMODE: disable
       PGUSER: tinkerbell
+      TINKERBELL_GRPC_AUTHORITY: 127.0.0.1:42113
+      TINKERBELL_HTTP_AUTHORITY: :42114
       TINK_AUTH_USERNAME: ${TINKERBELL_TINK_USERNAME:-admin}
       TINK_AUTH_PASSWORD: ${TINKERBELL_TINK_PASSWORD:-admin}
     depends_on:
@@ -23,7 +25,7 @@ services:
       db:
         condition: service_healthy
     healthcheck:
-      test: ["CMD-SHELL", "wget -qO- 127.0.0.1:42114/cert"]
+      test: ["CMD-SHELL", "wget -qO- 127.0.0.1:42114/cert"] # port needs to match TINKERBELL_HTTP_AUTHORITY
       interval: 5s
       timeout: 2s
       retries: 30

grpc-server/grpc-server.go

@@ -25,7 +25,7 @@ import (
 
 var (
 	logger         log.Logger
-	grpcListenAddr = ":42113"
+	grpcListenAddr = os.Getenv("TINKERBELL_GRPC_AUTHORITY")
 )
 
 // Server is the gRPC server for tinkerbell
@@ -76,6 +76,9 @@ func SetupGRPC(ctx context.Context, log log.Logger, facility string, errCh chan<
 
 	go func() {
 		logger.Info("serving grpc")
+		if grpcListenAddr == "" {
+			grpcListenAddr = ":42113"
+		}
 		lis, err := net.Listen("tcp", grpcListenAddr)
 		if err != nil {
 			err = errors.Wrap(err, "failed to listen")

http-server/http-server.go

@@ -25,8 +25,8 @@ import (
 var (
 	gitRev         = "unknown"
 	gitRevJSON     []byte
-	grpcListenAddr = "localhost:42113"
-	httpListenAddr = ":42114"
+	grpcListenAddr = os.Getenv("TINKERBELL_GRPC_AUTHORITY")
+	httpListenAddr = os.Getenv("TINKERBELL_HTTP_AUTHORITY")
 	authUsername   = os.Getenv("TINK_AUTH_USERNAME")
 	authPassword   = os.Getenv("TINK_AUTH_PASSWORD")
 	startTime      = time.Now()
@@ -48,6 +48,10 @@ func SetupHTTP(ctx context.Context, lg log.Logger, certPEM []byte, modTime time.
 	mux := grpcRuntime.NewServeMux()
 
 	dialOpts := []grpc.DialOption{grpc.WithTransportCredentials(creds)}
+
+	if grpcListenAddr == "" {
+		grpcListenAddr = "localhost:42113"
+	}
 	err := hardware.RegisterHardwareServiceHandlerFromEndpoint(ctx, mux, grpcListenAddr, dialOpts)
 	if err != nil {
 		logger.Error(err)
@@ -70,6 +74,9 @@ func SetupHTTP(ctx context.Context, lg log.Logger, certPEM []byte, modTime time.
 	http.HandleFunc("/_packet/healthcheck", healthCheckHandler)
 	http.Handle("/", BasicAuth(mux))
 
+	if httpListenAddr == "" {
+		httpListenAddr = ":42114"
+	}
 	srv := &http.Server{
 		Addr: httpListenAddr,
 	}