-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6460 from josedonizetti/kic-darwin-tunnel
WIP: kic darwin tunnel
- Loading branch information
Showing
6 changed files
with
247 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| package kic | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os/exec" | ||
|
|
||
| v1 "k8s.io/api/core/v1" | ||
| ) | ||
|
|
||
| type sshConn struct { | ||
| name string | ||
| cmd *exec.Cmd | ||
| } | ||
|
|
||
| func createSSHConn(name, sshPort, sshKey string, svc v1.Service) *sshConn { | ||
| // extract sshArgs | ||
| sshArgs := []string{ | ||
| "-N", | ||
| "[email protected]", | ||
| "-p", sshPort, | ||
| "-i", sshKey, | ||
| } | ||
|
|
||
| for _, port := range svc.Spec.Ports { | ||
| arg := fmt.Sprintf( | ||
| "-L %d:%s:%d", | ||
| port.Port, | ||
| svc.Spec.ClusterIP, | ||
| port.Port, | ||
| ) | ||
|
|
||
| sshArgs = append(sshArgs, arg) | ||
| } | ||
|
|
||
| cmd := exec.Command("ssh", sshArgs...) | ||
|
|
||
| return &sshConn{ | ||
| name: name, | ||
| cmd: cmd, | ||
| } | ||
| } | ||
|
|
||
| func (c *sshConn) run() error { | ||
| fmt.Printf("starting tunnel for %s\n", c.name) | ||
| return c.cmd.Run() | ||
| } | ||
|
|
||
| func (c *sshConn) stop() error { | ||
| fmt.Printf("stopping tunnel for %s\n", c.name) | ||
| return c.cmd.Process.Kill() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| package kic | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "strings" | ||
| "time" | ||
|
|
||
| "github.com/golang/glog" | ||
| v1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| typed_core "k8s.io/client-go/kubernetes/typed/core/v1" | ||
|
|
||
| "k8s.io/minikube/pkg/minikube/tunnel" | ||
| ) | ||
|
|
||
| // SSHTunnel ... | ||
| type SSHTunnel struct { | ||
| ctx context.Context | ||
| sshPort string | ||
| sshKey string | ||
| v1Core typed_core.CoreV1Interface | ||
| LoadBalancerEmulator tunnel.LoadBalancerEmulator | ||
| conns map[string]*sshConn | ||
| connsToStop map[string]*sshConn | ||
| } | ||
|
|
||
| // NewSSHTunnel ... | ||
| func NewSSHTunnel(ctx context.Context, sshPort, sshKey string, v1Core typed_core.CoreV1Interface) *SSHTunnel { | ||
| return &SSHTunnel{ | ||
| ctx: ctx, | ||
| sshPort: sshPort, | ||
| sshKey: sshKey, | ||
| v1Core: v1Core, | ||
| LoadBalancerEmulator: tunnel.NewLoadBalancerEmulator(v1Core), | ||
| conns: make(map[string]*sshConn), | ||
| connsToStop: make(map[string]*sshConn), | ||
| } | ||
| } | ||
|
|
||
| // Start ... | ||
| func (t *SSHTunnel) Start() error { | ||
| for { | ||
| select { | ||
| case <-t.ctx.Done(): | ||
| _, err := t.LoadBalancerEmulator.Cleanup() | ||
| if err != nil { | ||
| glog.Errorf("error cleaning up: %v", err) | ||
| } | ||
| return err | ||
| default: | ||
| } | ||
|
|
||
| services, err := t.v1Core.Services("").List(metav1.ListOptions{}) | ||
| if err != nil { | ||
| glog.Errorf("error listing services: %v", err) | ||
| } | ||
|
|
||
| t.markConnectionsToBeStopped() | ||
|
|
||
| for _, svc := range services.Items { | ||
| if svc.Spec.Type == v1.ServiceTypeLoadBalancer { | ||
| t.startConnection(svc) | ||
| } | ||
| } | ||
|
|
||
| t.stopMarkedConnections() | ||
|
|
||
| // TODO: which time to use? | ||
| time.Sleep(1 * time.Second) | ||
| } | ||
| } | ||
|
|
||
| func (t *SSHTunnel) markConnectionsToBeStopped() { | ||
| for _, conn := range t.conns { | ||
| t.connsToStop[conn.name] = conn | ||
| } | ||
| } | ||
|
|
||
| func (t *SSHTunnel) startConnection(svc v1.Service) { | ||
| uniqName := sshConnUniqName(svc) | ||
| existingSSHConn, ok := t.conns[uniqName] | ||
|
|
||
| if ok { | ||
| // if the svc still exist we remove the conn from the stopping list | ||
| delete(t.connsToStop, existingSSHConn.name) | ||
| return | ||
| } | ||
|
|
||
| // create new ssh conn | ||
| newSSHConn := createSSHConn(uniqName, t.sshPort, t.sshKey, svc) | ||
| t.conns[newSSHConn.name] = newSSHConn | ||
|
|
||
| go func() { | ||
| err := newSSHConn.run() | ||
| if err != nil { | ||
| glog.Errorf("error starting ssh tunnel: %v", err) | ||
| } | ||
|
|
||
| }() | ||
|
|
||
| err := t.LoadBalancerEmulator.PatchServiceIP(t.v1Core.RESTClient(), svc, "127.0.0.1") | ||
| if err != nil { | ||
| glog.Errorf("error patching service: %v", err) | ||
| } | ||
| } | ||
|
|
||
| func (t *SSHTunnel) stopMarkedConnections() { | ||
| for _, sshConn := range t.connsToStop { | ||
| err := sshConn.stop() | ||
| if err != nil { | ||
| glog.Errorf("error stopping ssh tunnel: %v", err) | ||
| } | ||
| delete(t.conns, sshConn.name) | ||
| delete(t.connsToStop, sshConn.name) | ||
| } | ||
| } | ||
|
|
||
| // sshConnName creates a uniq name for the tunnel, using its name/clusterIP/ports. | ||
| // This allows a new process to be created if an existing service was changed, | ||
| // the new process will support the IP/Ports change ocurred. | ||
| func sshConnUniqName(service v1.Service) string { | ||
| n := []string{ | ||
| service.Name, | ||
| "-", | ||
| service.Spec.ClusterIP, | ||
| } | ||
|
|
||
| for _, port := range service.Spec.Ports { | ||
| n = append(n, fmt.Sprintf("-%d", port.Port)) | ||
| } | ||
|
|
||
| return strings.Join(n, "") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.