feat: allow set image in simpleConfig.Registries.Create (#1056)

pull/1064/head
flaneur 2 years ago committed by GitHub
parent feeb4c5e94
commit eb5bd52638
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      pkg/config/transform.go
  2. 7
      pkg/config/v1alpha4/schema.json
  3. 1
      pkg/config/v1alpha4/types.go

@ -314,10 +314,15 @@ func TransformSimpleToClusterConfig(ctx context.Context, runtime runtimes.Runtim
regName = simpleConfig.Registries.Create.Name
}
image := fmt.Sprintf("%s:%s", k3d.DefaultRegistryImageRepo, k3d.DefaultRegistryImageTag)
if simpleConfig.Registries.Create.Image != "" {
image = simpleConfig.Registries.Create.Image
}
clusterCreateOpts.Registries.Create = &k3d.Registry{
ClusterRef: newCluster.Name,
Host: regName,
Image: fmt.Sprintf("%s:%s", k3d.DefaultRegistryImageRepo, k3d.DefaultRegistryImageTag),
Image: image,
ExposureOpts: *regPort,
}
}

@ -294,6 +294,13 @@
"2345"
],
"default": "random"
},
"image": {
"type": "string",
"examples": [
"myregistry/registry:2"
],
"default": "docker.io/library/registry:2"
}
},
"additionalProperties": false

@ -85,6 +85,7 @@ type SimpleConfigRegistryCreateConfig struct {
Name string `mapstructure:"name" yaml:"name,omitempty" json:"name,omitempty"`
Host string `mapstructure:"host" yaml:"host,omitempty" json:"host,omitempty"`
HostPort string `mapstructure:"hostPort" yaml:"hostPort,omitempty" json:"hostPort,omitempty"`
Image string `mapstructure:"image" yaml:"image,omitempty" json:"image,omitempty"`
}
// SimpleConfigOptionsKubeconfig describes the set of options referring to the kubeconfig during cluster creation.

Loading…
Cancel
Save