Merge pull request #102 from calmkart/master

enhancement: After forward, remove lo0 interface alias

pkg/fwdnet/fwdnet.go

@@ -74,3 +74,13 @@ func ReadyInterface(a byte, b byte, c byte, d int, port string) (net.IP, int, er
 
 	return net.IP{}, d, errors.New("unable to find an available IP/Port")
 }
+
+// RemoveInterfaceAlias can remove the Interface alias after port forwarding.
+// if -alias command get err, just print the error and continue.
+func RemoveInterfaceAlias(ip net.IP) {
+	cmd := "ifconfig"
+	args := []string{"lo0", "-alias", ip.String()}
+	if err := exec.Command(cmd, args...).Run(); err != nil {
+		fmt.Println("Cannot ifconfig lo0 -alias " + ip.String() + "\r\n" + err.Error())
+	}
+}

pkg/fwdport/fwdport.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	log "github.com/sirupsen/logrus"
+	"github.com/txn2/kubefwd/pkg/fwdnet"
 	"github.com/txn2/kubefwd/pkg/fwdpub"
 	"github.com/txn2/txeh"
 	v1 "k8s.io/api/core/v1"
@@ -108,6 +109,7 @@ func (pfo *PortForwardOpts) PortForward() error {
 		close(signalChan)
 		if pfStopChannel != nil {
 			pfo.removeHosts()
+			pfo.removeInterfaceAlias()
 			close(pfStopChannel)
 		}
 	}()
@@ -246,6 +248,10 @@ func (pfo *PortForwardOpts) removeHosts() {
 	pfo.Hostfile.Unlock()
 }
 
+func (pfo *PortForwardOpts) removeInterfaceAlias() {
+	fwdnet.RemoveInterfaceAlias(pfo.LocalIp)
+}
+
 // Waiting for the pod running
 func (pfo *PortForwardOpts) WaitForPodRunning(signalsChan chan struct{}) (*v1.Pod, error) {
 	pod, err := pfo.ClientSet.CoreV1().Pods(pfo.Namespace).Get(pfo.PodName, metav1.GetOptions{})