fix: handle colima host (#1228)

pull/1230/head
Dejan Benedik 2 years ago committed by GitHub
parent 0f9ca6097b
commit 338672522a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 15
      pkg/client/host.go
  2. 1
      pkg/runtimes/docker/info.go
  3. 1
      pkg/runtimes/types/types.go

@ -91,6 +91,21 @@ func GetHostIP(ctx context.Context, runtime runtimes.Runtime, cluster *k3d.Clust
}
// Colima
if rtimeInfo.InfoName == "colima" {
toolsNode, err := EnsureToolsNode(ctx, runtime, cluster)
if err != nil {
return nil, fmt.Errorf("failed to ensure that k3d-tools node is running to get host IP :%w", err)
}
limaIP, err := resolveHostnameFromInside(ctx, runtime, toolsNode, "host.lima.internal", ResolveHostCmdGetEnt)
if err == nil {
return limaIP, nil
}
l.Log().Debugf("[GetHostIP on colima] failed to resolve 'host.lima.internal' from inside the k3d-tools node: %v", err)
}
ip, err := runtime.GetHostIP(ctx, cluster.Network.Name)
if err != nil {
return nil, fmt.Errorf("runtime failed to get host IP: %w", err)

@ -53,6 +53,7 @@ func (d Docker) Info() (*runtimeTypes.RuntimeInfo, error) {
CgroupVersion: info.CgroupVersion,
CgroupDriver: info.CgroupDriver,
Filesystem: "UNKNOWN",
InfoName: info.Name,
}
// Get the backing filesystem for the storage driver

@ -31,6 +31,7 @@ type RuntimeInfo struct {
CgroupVersion string `json:"cgroupversion,omitempty"`
CgroupDriver string `json:"cgroupdriver,omitempty"`
Filesystem string `json:"filesystem,omitempty"`
InfoName string `json:"infoname,omitempty"`
}
type NodeLogsOpts struct {

Loading…
Cancel
Save