mirrors/k3d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[FIX] Do not override hostIP when hostPort is missing (#693, @lukaszo)

Browse Source
This commit is contained in:
Łukasz Oleś 2021-08-16 14:58:33 +02:00 committed by GitHub
parent 3b8c877b43
commit 5d0d0acc77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/cluster/clusterCreate.go
View File

@ -26,6 +26,7 @@ import (
"fmt" "fmt"
"os" "os"
"runtime" "runtime"
"strconv"
"strings" "strings"
"time" "time"
@ -390,10 +391,15 @@ func applyCLIOverrides(cfg conf.SimpleConfig) (conf.SimpleConfig, error) {
// Set to random port if port is empty string // Set to random port if port is empty string
if len(exposeAPI.Binding.HostPort) == 0 { if len(exposeAPI.Binding.HostPort) == 0 {
exposeAPI, err = cliutil.ParsePortExposureSpec("random", k3d.DefaultAPIPort) var freePort string
if err != nil { port, err := cliutil.GetFreePort()
return cfg, err freePort = strconv.Itoa(port)
if err != nil || port == 0 {
log.Warnf("Failed to get random free port: %+v", err)
log.Warnf("Falling back to internal port %s (may be blocked though)...", k3d.DefaultAPIPort)
freePort = k3d.DefaultAPIPort
} }
exposeAPI.Binding.HostPort = freePort
} }
cfg.ExposeAPI = conf.SimpleExposureOpts{ cfg.ExposeAPI = conf.SimpleExposureOpts{