supervisor: Remove slirp4netns

Author: utam0k

components/supervisor/pkg/ports/ports.go

@@ -33,28 +33,18 @@ func init() {
 }
 
 // NewManager creates a new port manager
-func NewManager(exposed ExposedPortsInterface, served ServedPortsObserver, config ConfigInterace, tunneled TunneledPortsInterface, slirp SlirpClient, internalPorts ...uint32) *Manager {
+func NewManager(exposed ExposedPortsInterface, served ServedPortsObserver, config ConfigInterace, tunneled TunneledPortsInterface, internalPorts ...uint32) *Manager {
 	state := make(map[uint32]*managedPort)
 	internal := make(map[uint32]struct{})
 	for _, p := range internalPorts {
 		internal[p] = struct{}{}
 	}
 
-	if slirp != nil {
-		for _, p := range internalPorts {
-			err := slirp.Expose(p)
-			if err != nil {
-				log.WithError(err).WithField("port", p).Error("cannot expose port")
-			}
-		}
-	}
-
 	return &Manager{
-		E:     exposed,
-		S:     served,
-		C:     config,
-		T:     tunneled,
-		Slirp: slirp,
+		E: exposed,
+		S: served,
+		C: config,
+		T: tunneled,
 
 		forceUpdates: make(chan struct{}, 1),
 
@@ -85,11 +75,10 @@ type autoExposure struct {
 // Manager brings together served and exposed ports. It keeps track of which port is exposed, which one is served,
 // auto-exposes ports and proxies ports served on localhost only.
 type Manager struct {
-	E     ExposedPortsInterface
-	S     ServedPortsObserver
-	C     ConfigInterace
-	T     TunneledPortsInterface
-	Slirp SlirpClient
+	E ExposedPortsInterface
+	S ServedPortsObserver
+	C ConfigInterace
+	T TunneledPortsInterface
 
 	forceUpdates chan struct{}
 
@@ -288,7 +277,6 @@ func (pm *Manager) updateState(ctx context.Context, exposed []ExposedPort, serve
 			log.WithField("served", newServed).Debug("updating served ports")
 			pm.served = newServed
 			pm.updateProxies()
-			pm.updateSlirp()
 			pm.autoTunnel(ctx)
 		}
 	}
@@ -537,19 +525,6 @@ func (pm *Manager) autoTunnel(ctx context.Context) {
 	}
 }
 
-func (pm *Manager) updateSlirp() {
-	if pm.Slirp == nil {
-		return
-	}
-
-	for _, served := range pm.served {
-		err := pm.Slirp.Expose(served.Port)
-		if err != nil {
-			log.WithError(err).Debug("cannot expose port for slirp")
-		}
-	}
-}
-
 func (pm *Manager) updateProxies() {
 	servedPortMap := map[uint32]bool{}
 	for _, s := range pm.served {

components/supervisor/pkg/ports/ports_test.go

@@ -517,7 +517,7 @@ func TestPortsUpdateState(t *testing.T) {
 					Error:   make(chan error, 1),
 				}
 
-				pm    = NewManager(exposed, served, config, tunneled, nil, test.InternalPorts...)
+				pm    = NewManager(exposed, served, config, tunneled, test.InternalPorts...)
 				updts [][]*api.PortsStatus
 			)
 			pm.proxyStarter = func(port uint32) (io.Closer, error) {
@@ -683,7 +683,7 @@ func TestPortsConcurrentSubscribe(t *testing.T) {
 			Changes: make(chan []PortTunnelState),
 			Error:   make(chan error, 1),
 		}
-		pm = NewManager(exposed, served, config, tunneled, nil)
+		pm = NewManager(exposed, served, config, tunneled)
 	)
 	pm.proxyStarter = func(local uint32) (io.Closer, error) {
 		return io.NopCloser(nil), nil

components/supervisor/pkg/ports/slirp4netns.go

@@ -193,11 +193,6 @@ func Run(options ...RunOption) {
 		log.WithError(err).Warn("cannot tunnel internal ports")
 	}
 
-	var slirp ports.SlirpClient
-	if _, err := os.Stat("/.supervisor/slirp4netns.sock/slirp4netns.sock"); err == nil {
-		slirp = ports.Slirp4Netns("/.supervisor/slirp4netns.sock/slirp4netns.sock")
-	}
-
 	ctx, cancel := context.WithCancel(context.Background())
 
 	internalPorts := []uint32{uint32(cfg.IDEPort), uint32(cfg.APIEndpointPort), uint32(cfg.SSHPort)}
@@ -219,7 +214,6 @@ func Run(options ...RunOption) {
 			},
 			ports.NewConfigService(cfg.WorkspaceID, gitpodConfigService, gitpodService),
 			tunneledPortsService,
-			slirp,
 			internalPorts...,
 		)
 		termMux             = terminal.NewMux()