mirror of https://github.com/k3d-io/k3d
Merge pull request #360 from rancher/enhancement/host-ip
[Enhancement] Expose Host IP to services inside the clusterpull/368/head
Thorsten Klein
4 years ago
committed by
GitHub
commit
54b4123fc4
@ -0,0 +1,102 @@ |
||||
/* |
||||
Copyright © 2020 The k3d Author(s) |
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy |
||||
of this software and associated documentation files (the "Software"), to deal |
||||
in the Software without restriction, including without limitation the rights |
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
||||
copies of the Software, and to permit persons to whom the Software is |
||||
furnished to do so, subject to the following conditions: |
||||
|
||||
The above copyright notice and this permission notice shall be included in |
||||
all copies or substantial portions of the Software. |
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
||||
THE SOFTWARE. |
||||
*/ |
||||
package cluster |
||||
|
||||
import ( |
||||
"bufio" |
||||
"context" |
||||
"fmt" |
||||
"net" |
||||
"regexp" |
||||
"runtime" |
||||
|
||||
rt "github.com/rancher/k3d/v3/pkg/runtimes" |
||||
k3d "github.com/rancher/k3d/v3/pkg/types" |
||||
"github.com/rancher/k3d/v3/pkg/util" |
||||
log "github.com/sirupsen/logrus" |
||||
) |
||||
|
||||
var nsLookupAddressRegexp = regexp.MustCompile(`^Address:\s+(?P<ip>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$`) |
||||
|
||||
// GetHostIP returns the routable IP address to be able to access services running on the host system from inside the cluster.
|
||||
// This depends on the Operating System and the chosen Runtime.
|
||||
func GetHostIP(ctx context.Context, rtime rt.Runtime, cluster *k3d.Cluster) (net.IP, error) { |
||||
|
||||
// Docker Runtime
|
||||
if rtime == rt.Docker { |
||||
|
||||
log.Debugf("Runtime GOOS: %s", runtime.GOOS) |
||||
|
||||
// "native" Docker on Linux
|
||||
if runtime.GOOS == "linux" { |
||||
ip, err := rtime.GetHostIP(ctx, cluster.Network.Name) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
return ip, nil |
||||
} |
||||
|
||||
// Docker (for Desktop) on MacOS or Windows
|
||||
if runtime.GOOS == "windows" || runtime.GOOS == "darwin" { |
||||
ip, err := resolveHostnameFromInside(ctx, rtime, cluster.Nodes[0], "host.docker.internal") |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
return ip, nil |
||||
} |
||||
|
||||
// Catch all other GOOS cases
|
||||
return nil, fmt.Errorf("GetHostIP only implemented for Linux, MacOS (Darwin) and Windows") |
||||
|
||||
} |
||||
|
||||
// Catch all other runtime selections
|
||||
return nil, fmt.Errorf("GetHostIP only implemented for the docker runtime") |
||||
|
||||
} |
||||
|
||||
func resolveHostnameFromInside(ctx context.Context, rtime rt.Runtime, node *k3d.Node, hostname string) (net.IP, error) { |
||||
|
||||
logreader, err := rtime.ExecInNodeGetLogs(ctx, node, []string{"sh", "-c", fmt.Sprintf("nslookup %s", hostname)}) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
|
||||
submatches := map[string]string{} |
||||
scanner := bufio.NewScanner(logreader) |
||||
for scanner.Scan() { |
||||
match := nsLookupAddressRegexp.FindStringSubmatch(scanner.Text()) |
||||
if len(match) == 0 { |
||||
continue |
||||
} |
||||
submatches = util.MapSubexpNames(nsLookupAddressRegexp.SubexpNames(), match) |
||||
break |
||||
} |
||||
if _, ok := submatches["ip"]; !ok { |
||||
return nil, fmt.Errorf("Failed to read address for '%s' from nslookup response", hostname) |
||||
} |
||||
|
||||
log.Debugf("Hostname '%s' -> Address '%s'", hostname, submatches["ip"]) |
||||
|
||||
return net.ParseIP(submatches["ip"]), nil |
||||
|
||||
} |
||||
@ -0,0 +1,32 @@ |
||||
/* |
||||
Copyright © 2020 The k3d Author(s) |
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy |
||||
of this software and associated documentation files (the "Software"), to deal |
||||
in the Software without restriction, including without limitation the rights |
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
||||
copies of the Software, and to permit persons to whom the Software is |
||||
furnished to do so, subject to the following conditions: |
||||
|
||||
The above copyright notice and this permission notice shall be included in |
||||
all copies or substantial portions of the Software. |
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
||||
THE SOFTWARE. |
||||
*/ |
||||
package containerd |
||||
|
||||
import ( |
||||
"context" |
||||
"net" |
||||
) |
||||
|
||||
// GetHostIP returns the IP of the containerd host
|
||||
func (d Containerd) GetHostIP(ctx context.Context, network string) (net.IP, error) { |
||||
return nil, nil |
||||
} |
||||
@ -0,0 +1,43 @@ |
||||
/* |
||||
Copyright © 2020 The k3d Author(s) |
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy |
||||
of this software and associated documentation files (the "Software"), to deal |
||||
in the Software without restriction, including without limitation the rights |
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
||||
copies of the Software, and to permit persons to whom the Software is |
||||
furnished to do so, subject to the following conditions: |
||||
|
||||
The above copyright notice and this permission notice shall be included in |
||||
all copies or substantial portions of the Software. |
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
||||
THE SOFTWARE. |
||||
*/ |
||||
package docker |
||||
|
||||
import ( |
||||
"context" |
||||
"fmt" |
||||
"net" |
||||
"runtime" |
||||
) |
||||
|
||||
// GetHostIP returns the IP of the docker host (routable from inside the containers)
|
||||
func (d Docker) GetHostIP(ctx context.Context, network string) (net.IP, error) { |
||||
if runtime.GOOS == "linux" { |
||||
ip, err := GetGatewayIP(ctx, network) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
return ip, nil |
||||
} |
||||
|
||||
return nil, fmt.Errorf("Docker Runtime: GetHostIP only implemented for Linux") |
||||
|
||||
} |
||||
@ -0,0 +1,33 @@ |
||||
/* |
||||
Copyright © 2020 The k3d Author(s) |
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy |
||||
of this software and associated documentation files (the "Software"), to deal |
||||
in the Software without restriction, including without limitation the rights |
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
||||
copies of the Software, and to permit persons to whom the Software is |
||||
furnished to do so, subject to the following conditions: |
||||
|
||||
The above copyright notice and this permission notice shall be included in |
||||
all copies or substantial portions of the Software. |
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
||||
THE SOFTWARE. |
||||
*/ |
||||
|
||||
package util |
||||
|
||||
// MapSubexpNames maps regex capturing group names to corresponding matches
|
||||
func MapSubexpNames(names, matches []string) map[string]string { |
||||
//names, matches = names[1:], matches[1:]
|
||||
nameMatchMap := make(map[string]string, len(matches)) |
||||
for index := range names { |
||||
nameMatchMap[names[index]] = matches[index] |
||||
} |
||||
return nameMatchMap |
||||
} |
||||
Loading…
Reference in new issue