[ws-proxy] Remove proxy of ws-manager.

Author: aledbf

chart/templates/ws-proxy-configmap.yaml

@@ -63,16 +63,7 @@ data:
                 "location": "/app/public"
             }
         },
-        {{ if (and $comp.wsManagerProxy $comp.wsManagerProxy.enabled) }}
-        "wsManagerProxy": {
-            "listenAddress": "{{ $comp.wsManagerProxy.listenAddress }}",
-            "rateLimiter": {
-                "refillInterval": "1s",
-                "bucketSize": {{ $comp.wsManagerProxy.ratelimit.maxRPS }}
-            }
-        },
-        {{ end }}
-        "pprofAddr": ":60060",
+        "pprofAddr": ":6060",
         "readinessProbeAddr": ":60088",
         "prometheusAddr": ":60095"
     }

chart/templates/ws-proxy-networkpolicy.yaml

@@ -26,8 +26,4 @@ spec:
       port: {{ $comp.ports.httpProxy.containerPort }}
     - protocol: TCP
       port: {{ $comp.ports.httpsProxy.containerPort }}
-    {{ if $comp.ports.wsManagerProxy }}
-    - protocol: TCP
-      port: {{ $comp.ports.wsManagerProxy.containerPort }}
-    {{ end }}
 {{ end }}

chart/values.yaml

@@ -524,12 +524,6 @@ components:
       memory: 64Mi
     replicas: 1
     hostHeader: "x-wsproxy-host"
-    wsManagerProxy:
-      enabled: false
-      listenAddress: ":8081"
-      ratelimit:
-        # Limits the # of requests (per second)
-        maxRPS: 10
     ports:
       httpProxy:
         expose: true

components/ws-proxy/cmd/root.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/gitpod-io/gitpod/common-go/log"
 	"github.com/gitpod-io/gitpod/common-go/tracing"
-	"github.com/gitpod-io/gitpod/common-go/util"
 	"github.com/gitpod-io/gitpod/ws-proxy/pkg/proxy"
 )
 
@@ -60,7 +59,6 @@ type Config struct {
 	PProfAddr                   string                            `json:"pprofAddr"`
 	PrometheusAddr              string                            `json:"prometheusAddr"`
 	ReadinessProbeAddr          string                            `json:"readinessProbeAddr"`
-	WSManagerProxy              WSManagerProxyConfig              `json:"wsManagerProxy"`
 }
 
 // Validate validates the configuration to catch issues during startup and not at runtime
@@ -74,38 +72,7 @@ func (c *Config) Validate() error {
 	if err := c.WorkspaceInfoProviderConfig.Validate(); err != nil {
 		return err
 	}
-	if err := c.WSManagerProxy.Validate(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// WSManagerProxyConfig configures the ws-manager TCP proxy
-type WSManagerProxyConfig struct {
-	ListenAddress string            `json:"listenAddress"`
-	RateLimiter   RateLimiterConfig `json:"rateLimiter"`
-}
 
-// Validate validates this config
-func (c *WSManagerProxyConfig) Validate() error {
-	if c != nil && len(c.ListenAddress) > 0 {
-		return c.RateLimiter.Validate()
-	}
-	return nil
-}
-
-// RateLimiterConfig configures a rate limiter
-type RateLimiterConfig struct {
-	RefillInterval util.Duration `json:"refillInterval"`
-	BucketSize     int           `json:"bucketSize"`
-}
-
-// Validate validates this config
-func (c *RateLimiterConfig) Validate() error {
-	if c == nil {
-		return xerrors.Errorf("rate limiter config is nil")
-	}
 	return nil
 }
 

components/ws-proxy/cmd/run.go

@@ -5,23 +5,19 @@
 package cmd
 
 import (
-	"context"
-	"net"
 	"net/http"
 	"os"
 	"os/signal"
 	"syscall"
 	"time"
 
-	"github.com/google/tcpproxy"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/spf13/cobra"
 
 	"github.com/gitpod-io/gitpod/common-go/log"
 	"github.com/gitpod-io/gitpod/common-go/pprof"
 	"github.com/gitpod-io/gitpod/ws-proxy/pkg/proxy"
-	"github.com/gitpod-io/gitpod/ws-proxy/pkg/ratelimit"
 )
 
 var jsonLog bool
@@ -96,26 +92,11 @@ var runCmd = &cobra.Command{
 			}()
 		}
 
-		ctx, cancel := context.WithCancel(context.Background())
-		if cfg.WSManagerProxy.ListenAddress != "" {
-			go func() {
-				tcpProxyListenAddr := cfg.WSManagerProxy.ListenAddress
-				wsManagerAddr := cfg.WorkspaceInfoProviderConfig.WsManagerAddr
-				refillInterval := time.Duration(cfg.WSManagerProxy.RateLimiter.RefillInterval)
-				bucketSize := cfg.WSManagerProxy.RateLimiter.BucketSize
-				err := startWSManagerTCPProxy(ctx, tcpProxyListenAddr, wsManagerAddr, refillInterval, bucketSize)
-				if err != nil {
-					log.WithError(err).Fatal("starting ws-manger TCP proxy failed")
-				}
-			}()
-		}
-
 		log.Info("🚪 ws-proxy is up and running")
 		sigChan := make(chan os.Signal, 1)
 		signal.Notify(sigChan, os.Interrupt, syscall.SIGTERM)
 		<-sigChan
 		log.Info("received SIGTERM, ws-proxy is stopping...")
-		cancel()
 
 		defer func() {
 			log.Info("ws-proxy stopped.")
@@ -126,21 +107,3 @@ var runCmd = &cobra.Command{
 func init() {
 	rootCmd.AddCommand(runCmd)
 }
-
-func startWSManagerTCPProxy(ctx context.Context, listenAddr string, wsManagerAddr string, refillInterval time.Duration, bucketSize int) error {
-	var p tcpproxy.Proxy
-	p.AddRoute(listenAddr, tcpproxy.To(wsManagerAddr))
-	if refillInterval != 0 && bucketSize != 0 {
-		p.ListenFunc = func(network, address string) (net.Listener, error) {
-			return ratelimit.NewListener(
-				ctx,
-				network,
-				address,
-				refillInterval,
-				bucketSize,
-			)
-		}
-	}
-	log.Infof("Forwarding ws-manager traffic: %s -> %s\n", listenAddr, wsManagerAddr)
-	return p.Run()
-}