Merge branch 'master' of github.com:txn2/kubefwd

txn2 · Jul 7, 2021 · 7269220 · 7269220
2 parents df9ff65 + 0da4473
commit 7269220
Show file tree

Hide file tree

Showing 8 changed files with 989 additions and 232 deletions.
diff --git a/cmd/kubefwd/services/services.go b/cmd/kubefwd/services/services.go
@@ -413,10 +413,11 @@ func (opts *NamespaceOpts) AddServiceHandler(obj interface{}) {
 		NamespaceServiceLock: opts.NamespaceIPLock,
 		Svc:                  svc,
 		Headless:             svc.Spec.ClusterIP == "None",
-		PortForwards:         make(map[string]*fwdport.PortForwardOpts),
+		PortForwards:         make(map[string][]*fwdport.PortForwardOpts),
 		SyncDebouncer:        debounce.New(5 * time.Second),
 		DoneChannel:          make(chan struct{}),
 		PortMap:              opts.ParsePortMap(mappings),
+		ManualStopChannel: opts.ManualStopChannel,
 	}
 
 	// Add the service to the catalog of services being forwarded

diff --git a/go.mod b/go.mod
@@ -5,11 +5,13 @@ go 1.16
 require (
 	github.com/bep/debounce v1.2.0
 	github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a // indirect
+	github.com/golang/mock v1.4.1
 	github.com/onsi/ginkgo v1.12.0 // indirect
 	github.com/onsi/gomega v1.9.0 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.6.0
 	github.com/spf13/cobra v1.1.1
+	github.com/stretchr/testify v1.6.1
 	github.com/txn2/txeh v1.2.1
 	golang.org/x/sys v0.0.0-20201112073958-5cba982894dd
 	k8s.io/api v0.20.4