Allow creating the registry on user-defined networks

This might be useful when a user wants to use a different network to run
the registry, especially for Podman users.

This patch avoids adding such a flag to clusterCreate to avoid polluting
the arguments for that command. A better long-term solution would be to
create a new network for the registry.

cmd/registry/registryCreate.go

@@ -41,8 +41,9 @@ type regCreatePreProcessedFlags struct {
 }
 
 type regCreateFlags struct {
-	Image  string
-	NoHelp bool
+	Image          string
+	DefaultNetwork string
+	NoHelp         bool
 }
 
 var helptext string = `# You can now use the registry like this (example):
@@ -103,6 +104,8 @@ func NewCmdRegistryCreate() *cobra.Command {
 
 	cmd.Flags().StringVarP(&ppFlags.Port, "port", "p", "random", "Select which port the registry should be listening on on your machine (localhost) (Format: `[HOST:]HOSTPORT`)\n - Example: `k3d registry create --port 0.0.0.0:5111`")
 
+	cmd.Flags().StringVar(&flags.DefaultNetwork, "default-network", k3d.DefaultNetwork, "Specify the default network connected to the registry (bridge)")
+
 	cmd.Flags().BoolVar(&flags.NoHelp, "no-help", false, "Disable the help text (How-To use the registry)")
 
 	// done
@@ -135,5 +138,5 @@ func parseCreateRegistryCmd(cmd *cobra.Command, args []string, flags *regCreateF
 		registryName = fmt.Sprintf("%s-%s", k3d.DefaultObjectNamePrefix, args[0])
 	}
 
-	return &k3d.Registry{Host: registryName, Image: flags.Image, ExposureOpts: *exposePort}, clusters
+	return &k3d.Registry{Host: registryName, Image: flags.Image, ExposureOpts: *exposePort, DefaultNetwork: flags.DefaultNetwork}, clusters
 }

pkg/client/cluster.go

@@ -583,7 +583,7 @@ func ClusterDelete(ctx context.Context, runtime k3drt.Runtime, cluster *k3d.Clus
 				if net == cluster.Network.Name {
 					continue
 				}
-				if net == "bridge" || net == "host" {
+				if net == k3d.DefaultNetwork || net == "host" {
 					continue
 				}
 				l.Log().Tracef("net: %s", net)

pkg/client/registry.go

@@ -62,11 +62,15 @@ func RegistryCreate(ctx context.Context, runtime runtimes.Runtime, reg *k3d.Regi
 	// 	l.Log().Fatalln(err)
 	// }
 
+	if len(reg.DefaultNetwork) == 0 {
+		reg.DefaultNetwork = k3d.DefaultNetwork
+	}
+
 	registryNode := &k3d.Node{
 		Name:     reg.Host,
 		Image:    reg.Image,
 		Role:     k3d.RegistryRole,
-		Networks: []string{"bridge"}, // Default network: TODO: change to const from types
+		Networks: []string{reg.DefaultNetwork},
 		Restart:  true,
 	}
 

pkg/types/defaults.go

@@ -94,3 +94,6 @@ func GetDefaultObjectName(name string) string {
 // container is in a crash loop.
 // This makes sense e.g. when a new server is waiting to join an existing cluster and has to wait for other learners to finish.
 const DefaultNodeWaitForLogMessageCrashLoopBackOffLimit = 10
+
+// DefaultNetwork defines the default Docker network
+const DefaultNetwork = "bridge"

pkg/types/registry.go

@@ -34,12 +34,13 @@ const (
 
 // Registry describes a k3d-managed registry
 type Registry struct {
-	ClusterRef   string       // filled automatically -> if created with a cluster
-	Protocol     string       `yaml:"protocol,omitempty" json:"protocol,omitempty"` // default: http
-	Host         string       `yaml:"host" json:"host"`
-	Image        string       `yaml:"image,omitempty" json:"image,omitempty"`
-	ExposureOpts ExposureOpts `yaml:"expose" json:"expose"`
-	Options      struct {
+	ClusterRef     string       // filled automatically -> if created with a cluster
+	Protocol       string       `yaml:"protocol,omitempty" json:"protocol,omitempty"` // default: http
+	Host           string       `yaml:"host" json:"host"`
+	Image          string       `yaml:"image,omitempty" json:"image,omitempty"`
+	DefaultNetwork string       `yaml:"defaultNetwork,omitempty" json:"defaultNetwork,omitempty"`
+	ExposureOpts   ExposureOpts `yaml:"expose" json:"expose"`
+	Options        struct {
 		ConfigFile string `yaml:"configFile,omitempty" json:"configFile,omitempty"`
 		Proxy      struct {
 			RemoteURL string `yaml:"remoteURL" json:"remoteURL"`