Configurable network

Squashed commit of the following:

commit 00521c4
Author: keymone <[email protected]>
Date:   Mon Oct 21 11:43:25 2019 +0100

    Allow specifying network name to use in docker provisioner

pkg/apis/config/v1alpha3/types.go

@@ -32,6 +32,9 @@ type Cluster struct {
 
 	/* Advanced fields */
 
+	// Network contains docker network to use in all containers
+	Network string `yaml:"network,omitempty" json:"network,omitempty"`
+
 	// Networking contains cluster wide network settings
 	Networking Networking `yaml:"networking,omitempty" json:"networking,omitempty"`
 

pkg/internal/apis/config/convert.go

@@ -24,6 +24,7 @@ func Convertv1alpha3(in *v1alpha3.Cluster) *Cluster {
 	in = in.DeepCopy() // deep copy first to avoid touching the original
 	out := &Cluster{
 		Nodes:                        make([]Node, len(in.Nodes)),
+		Network:                      in.Network,
 		KubeadmConfigPatches:         in.KubeadmConfigPatches,
 		KubeadmConfigPatchesJSON6902: make([]PatchJSON6902, len(in.KubeadmConfigPatchesJSON6902)),
 	}

pkg/internal/apis/config/types.go

@@ -30,6 +30,9 @@ type Cluster struct {
 
 	/* Advanced fields */
 
+	// Network contains docker network to use in all containers
+	Network string
+
 	// Networking contains cluster wide network settings
 	Networking Networking
 

pkg/internal/cluster/providers/docker/provision.go

@@ -116,11 +116,17 @@ func clusterHasImplicitLoadBalancer(cfg *config.Cluster) bool {
 // commonArgs computes static arguments that apply to all containers
 func commonArgs(cluster string, cfg *config.Cluster) ([]string, error) {
 	// standard arguments all nodes containers need, computed once
+	network := cfg.Network
+	if network == "" {
+		network = "bridge"
+	}
+
 	args := []string{
 		"--detach", // run the container detached
 		"--tty",    // allocate a tty for entrypoint logs
 		// label the node with the cluster ID
 		"--label", fmt.Sprintf("%s=%s", constants.ClusterLabelKey, cluster),
+		"--network", network,
 	}
 
 	// enable IPv6 if necessary