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

rename Registry field from name to host

Browse Source
This commit is contained in:
iwilltry42 2020-12-10 14:36:51 +01:00
parent a58785f442
commit 0c32c36d99
No known key found for this signature in database
GPG Key ID: 7BA57AD1CFF16110
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/registry/registryCreate.go
View File

@ -113,5 +113,5 @@ func parseCreateRegistryCmd(cmd *cobra.Command, args []string, flags *regCreateF
registryName = fmt.Sprintf("%s-%s", k3d.DefaultObjectNamePrefix, args[0]) registryName = fmt.Sprintf("%s-%s", k3d.DefaultObjectNamePrefix, args[0])
} }
return &k3d.Registry{Name: registryName, Image: flags.Image, Port: exposePort}, clusters return &k3d.Registry{Host: registryName, Image: flags.Image, Port: exposePort}, clusters
} }

8
pkg/client/registry.go
View File

@ -48,16 +48,16 @@ func RegistryRun(ctx context.Context, runtime runtimes.Runtime, reg *k3d.Registr
func RegistryCreate(ctx context.Context, runtime runtimes.Runtime, reg *k3d.Registry) (*k3d.Node, error) { func RegistryCreate(ctx context.Context, runtime runtimes.Runtime, reg *k3d.Registry) (*k3d.Node, error) {
// registry name // registry name
if len(reg.Name) == 0 { if len(reg.Host) == 0 {
reg.Name = k3d.DefaultRegistryName reg.Host = k3d.DefaultRegistryName
} }
if err := ValidateHostname(reg.Name); err != nil { if err := ValidateHostname(reg.Host); err != nil {
log.Errorln("Invalid name for registry") log.Errorln("Invalid name for registry")
log.Fatalln(err) log.Fatalln(err)
} }
registryNode := &k3d.Node{ registryNode := &k3d.Node{
Name: reg.Name, Name: reg.Host,
Image: reg.Image, Image: reg.Image,
Role: k3d.RegistryRole, Role: k3d.RegistryRole,
Network: "bridge", // Default network: TODO: change to const from types Network: "bridge", // Default network: TODO: change to const from types

2
pkg/config/transform.go
View File

@ -206,7 +206,7 @@ func TransformSimpleToClusterConfig(ctx context.Context, runtime runtimes.Runtim
} }
if simpleConfig.Registries.Create { if simpleConfig.Registries.Create {
clusterCreateOpts.Registries.Create = &k3d.Registry{ clusterCreateOpts.Registries.Create = &k3d.Registry{
Name: fmt.Sprintf("%s-%s-registry", k3d.DefaultObjectNamePrefix, newCluster.Name), Host: fmt.Sprintf("%s-%s-registry", k3d.DefaultObjectNamePrefix, newCluster.Name),
Image: fmt.Sprintf("%s:%s", k3d.DefaultRegistryImageRepo, k3d.DefaultRegistryImageTag), Image: fmt.Sprintf("%s:%s", k3d.DefaultRegistryImageRepo, k3d.DefaultRegistryImageTag),
Port: regPort, Port: regPort,
} }

2
pkg/types/types.go
View File

@ -356,7 +356,7 @@ const (
// Registry describes a k3d-managed registry // Registry describes a k3d-managed registry
type Registry struct { type Registry struct {
Name string `yaml:"name" json:"name"` Host string `yaml:"host" json:"host"`
Image string `yaml:"image,omitempty" json:"image,omitempty"` Image string `yaml:"image,omitempty" json:"image,omitempty"`
Port ExposePort `yaml:"port" json:"port"` Port ExposePort `yaml:"port" json:"port"`
Options struct { Options struct {