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

move global constants to types.go

Browse Source
This commit is contained in:
iwilltry42 2019-09-06 11:55:22 +02:00
parent 487418974e
commit f33fa2d4cc
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/commands.go
View File

@ -85,7 +85,7 @@ func CreateCluster(c *cli.Context) error {
image := c.String("image")
// if no registry was provided, use the default docker.io
if len(strings.Split(image, "/")) <= 2 {
image = fmt.Sprintf("%s/%s", defaultRegistry, image)
image = fmt.Sprintf("%s/%s", DefaultRegistry, image)
}
/*
@ -165,7 +165,7 @@ func CreateCluster(c *cli.Context) error {
* List of ports, that should be mapped from some or all k3d node containers to the host system (or other interface)
*/
// new port map
portmap, err := mapNodesToPortSpecs(c.StringSlice("port"), GetAllContainerNames(c.String("name"), defaultServerCount, c.Int("workers")))
portmap, err := mapNodesToPortSpecs(c.StringSlice("port"), GetAllContainerNames(c.String("name"), DefaultServerCount, c.Int("workers")))
if err != nil {
log.Fatal(err)
}
@ -480,7 +480,7 @@ func AddNode(c *cli.Context) error {
image := c.String("image")
// if no registry was provided, use the default docker.io
if len(strings.Split(image, "/")) <= 2 {
image = fmt.Sprintf("%s/%s", defaultRegistry, image)
image = fmt.Sprintf("%s/%s", DefaultRegistry, image)
}
clusterSpec.Image = image

6
cli/types.go
View File

@ -5,6 +5,12 @@ import (
"github.com/docker/go-connections/nat"
)
// Globally used constants
const (
DefaultRegistry = "docker.io"
DefaultServerCount = 1
)
// Cluster describes an existing cluster
type Cluster struct {
name string