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

unify the registry type

Browse Source
This commit is contained in:
iwilltry42 2020-12-11 08:56:26 +01:00
parent 621640c901
commit d042c79df2
No known key found for this signature in database
GPG Key ID: 7BA57AD1CFF16110
6 changed files with 37 additions and 39 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{Host: registryName, Image: flags.Image, Port: exposePort}, clusters return &k3d.Registry{Host: registryName, Image: flags.Image, Port: k3d.MappedPort{InternalPort: k3d.DefaultRegistryPort, ExternalPort: exposePort}}, clusters
} }

15
pkg/client/cluster.go
View File

@ -136,20 +136,17 @@ func ClusterPrep(ctx context.Context, runtime k3drt.Runtime, clusterConfig *conf
* Step 3: Registries * Step 3: Registries
*/ */
// Create managed registry bound to this cluster
if clusterConfig.ClusterCreateOpts.Registries.Create != nil { if clusterConfig.ClusterCreateOpts.Registries.Create != nil {
regNode, err := RegistryCreate(ctx, runtime, clusterConfig.ClusterCreateOpts.Registries.Create) if _, err := RegistryCreate(ctx, runtime, clusterConfig.ClusterCreateOpts.Registries.Create); err != nil {
if err != nil {
return fmt.Errorf("Failed to create registry: %+v", err) return fmt.Errorf("Failed to create registry: %+v", err)
} }
clusterConfig.ClusterCreateOpts.Registries.Use = append(clusterConfig.ClusterCreateOpts.Registries.Use, &k3d.ExternalRegistry{ clusterConfig.ClusterCreateOpts.Registries.Use = append(clusterConfig.ClusterCreateOpts.Registries.Use, clusterConfig.ClusterCreateOpts.Registries.Create)
Host: regNode.Name,
Port: k3d.DefaultRegistryPort,
ExternalPort: clusterConfig.ClusterCreateOpts.Registries.Create.Port.Port,
})
} }
log.Debugf("External Registries: %+v", clusterConfig.ClusterCreateOpts.Registries.Use) // Use existing registries (including the new one, if created)
log.Debugf("Using Registries: %+v", clusterConfig.ClusterCreateOpts.Registries.Use)
if len(clusterConfig.ClusterCreateOpts.Registries.Use) > 0 { if len(clusterConfig.ClusterCreateOpts.Registries.Use) > 0 {
// ensure that all selected registries exist and connect them to the cluster network // ensure that all selected registries exist and connect them to the cluster network
@ -164,7 +161,7 @@ func ClusterPrep(ctx context.Context, runtime k3drt.Runtime, clusterConfig *conf
} }
// generate the registries.yaml // generate the registries.yaml
regConf, err := RegistryGenerateK3sConfig(ctx, clusterConfig.ClusterCreateOpts.Registries.Create, clusterConfig.ClusterCreateOpts.Registries.Use) regConf, err := RegistryGenerateK3sConfig(ctx, clusterConfig.ClusterCreateOpts.Registries.Use)
if err != nil { if err != nil {
return fmt.Errorf("Failed to generate registry config file for k3s: %+v", err) return fmt.Errorf("Failed to generate registry config file for k3s: %+v", err)
} }

20
pkg/client/registry.go
View File

@ -72,9 +72,9 @@ func RegistryCreate(ctx context.Context, runtime runtimes.Runtime, reg *k3d.Regi
// setup the node labels // setup the node labels
registryNode.Labels = map[string]string{ registryNode.Labels = map[string]string{
k3d.LabelRole: string(k3d.RegistryRole), k3d.LabelRole: string(k3d.RegistryRole),
k3d.LabelRegistryHost: reg.Port.Host, // TODO: docker machine host? k3d.LabelRegistryHost: reg.Port.ExternalPort.Host, // TODO: docker machine host?
k3d.LabelRegistryHostIP: reg.Port.HostIP, k3d.LabelRegistryHostIP: reg.Port.ExternalPort.HostIP,
k3d.LabelRegistryPort: reg.Port.Port, k3d.LabelRegistryPort: reg.Port.ExternalPort.Port,
} }
for k, v := range k3d.DefaultObjectLabels { for k, v := range k3d.DefaultObjectLabels {
registryNode.Labels[k] = v registryNode.Labels[k] = v
@ -82,7 +82,7 @@ func RegistryCreate(ctx context.Context, runtime runtimes.Runtime, reg *k3d.Regi
// port // port
registryNode.Ports = []string{ registryNode.Ports = []string{
fmt.Sprintf("%s:%s:%s/tcp", reg.Port.HostIP, reg.Port.Port, k3d.DefaultRegistryPort), fmt.Sprintf("%s:%s:%s/tcp", reg.Port.ExternalPort.HostIP, reg.Port.ExternalPort.Port, k3d.DefaultRegistryPort),
} }
// create the registry node // create the registry node
@ -132,12 +132,12 @@ func RegistryConnect(ctx context.Context, runtime runtimes.Runtime, registryNode
} }
// RegistryGenerateK3sConfig generates the k3s specific registries.yaml configuration for multiple registries // RegistryGenerateK3sConfig generates the k3s specific registries.yaml configuration for multiple registries
func RegistryGenerateK3sConfig(ctx context.Context, internalRegistries *k3d.Registry, externalRegistries []*k3d.ExternalRegistry) (*k3s.Registry, error) { func RegistryGenerateK3sConfig(ctx context.Context, registries []*k3d.Registry) (*k3s.Registry, error) {
regConf := &k3s.Registry{} regConf := &k3s.Registry{}
for _, reg := range externalRegistries { for _, reg := range registries {
internalAddress := fmt.Sprintf("%s:%s", reg.Host, reg.Port) internalAddress := fmt.Sprintf("%s:%s", reg.Host, reg.Port.InternalPort)
externalAddress := fmt.Sprintf("%s:%s", reg.Host, reg.ExternalPort) externalAddress := fmt.Sprintf("%s:%s", reg.Host, reg.Port.ExternalPort.Port)
// init mirrors if nil // init mirrors if nil
if regConf.Mirrors == nil { if regConf.Mirrors == nil {
@ -150,8 +150,8 @@ func RegistryGenerateK3sConfig(ctx context.Context, internalRegistries *k3d.Regi
}, },
} }
if reg.Proxy != "" { if reg.Options.Proxy.RemoteURL != "" {
regConf.Mirrors[k3d.DefaultDockerHubAddress] = k3s.Mirror{ regConf.Mirrors[reg.Options.Proxy.RemoteURL] = k3s.Mirror{
Endpoints: []string{fmt.Sprintf("http://%s", internalAddress)}, Endpoints: []string{fmt.Sprintf("http://%s", internalAddress)},
} }
} }

5
pkg/config/transform.go
View File

@ -208,7 +208,10 @@ func TransformSimpleToClusterConfig(ctx context.Context, runtime runtimes.Runtim
clusterCreateOpts.Registries.Create = &k3d.Registry{ clusterCreateOpts.Registries.Create = &k3d.Registry{
Host: 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: k3d.MappedPort{
InternalPort: k3d.DefaultRegistryPort,
ExternalPort: regPort,
},
} }
} }

6
pkg/config/v1alpha1/types.go
View File

@ -126,9 +126,9 @@ type SimpleConfig struct {
Options SimpleConfigOptions `mapstructure:"options" yaml:"options" json:"options,omitempty"` Options SimpleConfigOptions `mapstructure:"options" yaml:"options" json:"options,omitempty"`
Env []EnvVarWithNodeFilters `mapstructure:"env" yaml:"env" json:"env,omitempty"` Env []EnvVarWithNodeFilters `mapstructure:"env" yaml:"env" json:"env,omitempty"`
Registries struct { Registries struct {
Use []*k3d.ExternalRegistry Use []*k3d.Registry `mapstructure:"use" yaml:"use,omitempty" json:"use,omitempty"`
Create bool Create bool `mapstructure:"create" yaml:"create,omitempty" json:"create,omitempty"`
} } `mapstructure:"registries" yaml:"registries,omitempty" json:"registries,omitempty"`
} }
// GetKind implements Config.GetKind // GetKind implements Config.GetKind

28
pkg/types/types.go
View File

@ -175,8 +175,8 @@ type ClusterCreateOpts struct {
GlobalLabels map[string]string `yaml:"globalLabels,omitempty" json:"globalLabels,omitempty"` GlobalLabels map[string]string `yaml:"globalLabels,omitempty" json:"globalLabels,omitempty"`
GlobalEnv []string `yaml:"globalEnv,omitempty" json:"globalEnv,omitempty"` GlobalEnv []string `yaml:"globalEnv,omitempty" json:"globalEnv,omitempty"`
Registries struct { Registries struct {
Create *Registry `yaml:"create,omitempty" json:"create,omitempty"` Create *Registry `yaml:"create,omitempty" json:"create,omitempty"`
Use []*ExternalRegistry `yaml:"use,omitempty" json:"use,omitempty"` Use []*Registry `yaml:"use,omitempty" json:"use,omitempty"`
} `yaml:"registries,omitempty" json:"registries,omitempty"` } `yaml:"registries,omitempty" json:"registries,omitempty"`
} }
@ -320,7 +320,13 @@ type ExternalDatastore struct {
Network string `yaml:"network" json:"network,omitempty"` Network string `yaml:"network" json:"network,omitempty"`
} }
// ExposedPort describes specs needed to expose the API-Server // MappedPort combines an internal port mapped to an exposed port
type MappedPort struct {
InternalPort string `yaml:"internal,omitempty" json:"internal,omitempty"`
ExternalPort ExposedPort `yaml:"expose,omitempty" json:"expose,omitempty"`
}
// ExposedPort describes a port exposed on the host system
type ExposedPort struct { type ExposedPort struct {
Host string `yaml:"host" json:"host,omitempty"` Host string `yaml:"host" json:"host,omitempty"`
HostIP string `yaml:"hostIP" json:"hostIP,omitempty"` HostIP string `yaml:"hostIP" json:"hostIP,omitempty"`
@ -356,10 +362,10 @@ const (
// Registry describes a k3d-managed registry // Registry describes a k3d-managed registry
type Registry struct { type Registry struct {
ClusterRef string // filled automatically -> if created with a cluster ClusterRef string // filled automatically -> if created with a cluster
Host string `yaml:"host" json:"host"` Host string `yaml:"host" json:"host"`
Image string `yaml:"image,omitempty" json:"image,omitempty"` Image string `yaml:"image,omitempty" json:"image,omitempty"`
Port ExposedPort `yaml:"port" json:"port"` Port MappedPort `yaml:"port" json:"port"`
Options struct { Options struct {
ConfigFile string `yaml:"configFile,omitempty" json:"configFile,omitempty"` ConfigFile string `yaml:"configFile,omitempty" json:"configFile,omitempty"`
Proxy struct { Proxy struct {
@ -369,11 +375,3 @@ type Registry struct {
} `yaml:"proxy,omitempty" json:"proxy,omitempty"` } `yaml:"proxy,omitempty" json:"proxy,omitempty"`
} `yaml:"options,omitempty" json:"options,omitempty"` } `yaml:"options,omitempty" json:"options,omitempty"`
} }
// ExternalRegistry describes a registry that is not managed together with the current cluster -> we only update the registries.yaml
type ExternalRegistry struct {
Host string `yaml:"host" json:"host"`
Port string `yaml:"port" json:"port"`
ExternalPort string `yaml:"externalPort" json:"externalPort"`
Proxy string `yaml:"proxy,omitempty" json:"proxy,omitempty"` // to use the external registry as a proxy for e.g. docker.io
}