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

make server the default node for portmaps

Browse Source
This commit is contained in:
iwilltry42 2019-05-14 20:48:48 +02:00
parent 2640fc13ce
commit 8512ac0c8a
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/port.go
View File

@ -39,6 +39,10 @@ func mapNodesToPortSpecs(specs []string, createdNodes []string) (map[string][]st
for _, spec := range specs { for _, spec := range specs {
nodes, portSpec := extractNodes(spec) nodes, portSpec := extractNodes(spec)
if len(nodes) == 0 {
nodes = append(nodes, defaultNodes)
}
for _, node := range nodes { for _, node := range nodes {
// check if node-specifier is valid (either a role or a name) and append to list if matches // check if node-specifier is valid (either a role or a name) and append to list if matches
nodeFound := false nodeFound := false

3
cli/util.go
View File

@ -49,7 +49,10 @@ func CheckClusterName(name string) error {
if len(name) > clusterNameMaxSize { if len(name) > clusterNameMaxSize {
return fmt.Errorf("[ERROR] Cluster name is too long (%d > %d)", len(name), clusterNameMaxSize) return fmt.Errorf("[ERROR] Cluster name is too long (%d > %d)", len(name), clusterNameMaxSize)
} }
if err := ValidateHostname(name); err != nil {
return fmt.Errorf("[ERROR] Invalid cluster name\n%+v", ValidateHostname(name)) return fmt.Errorf("[ERROR] Invalid cluster name\n%+v", ValidateHostname(name))
}
return nil
} }
// ValidateHostname ensures that a cluster name is also a valid host name according to RFC 1123. // ValidateHostname ensures that a cluster name is also a valid host name according to RFC 1123.