enable ipv6 on nodes

Author: aojea

pkg/cluster/internal/create/nodes.go

@@ -103,9 +103,16 @@ func createNodeContainers(
 		desiredNode := desiredNode // capture loop variable
 		fns = append(fns, func() error {
 			// create the node into a container (~= docker run -d)
-			_, err := desiredNode.Create(clusterLabel)
+			node, err := desiredNode.Create(clusterLabel)
+			if err != nil {
+				return err
+			}
+			if desiredNode.IPv6 {
+				err = node.EnableIPv6()
+			}
 			return err
 		})
+
 	}
 	if err := concurrent.UntilError(fns); err != nil {
 		return err
@@ -125,6 +132,7 @@ type nodeSpec struct {
 	// TODO(bentheelder): replace with a cri.PortMapping when we have that
 	APIServerPort    int32
 	APIServerAddress string
+	IPv6             bool
 }
 
 func nodesToCreate(cfg *config.Cluster, clusterName string) []nodeSpec {
@@ -154,6 +162,7 @@ func nodesToCreate(cfg *config.Cluster, clusterName string) []nodeSpec {
 		}
 	}
 	isHA := controlPlanes > 1
+	ipv6 := "ipv6" == cfg.Networking.IPFamily
 
 	// add all of the config nodes as desired nodes
 	for _, configNode := range configNodes {
@@ -173,6 +182,7 @@ func nodesToCreate(cfg *config.Cluster, clusterName string) []nodeSpec {
 			ExtraMounts:      configNode.ExtraMounts,
 			APIServerAddress: apiServerAddress,
 			APIServerPort:    apiServerPort,
+			IPv6:             ipv6,
 		})
 	}
 
@@ -186,6 +196,7 @@ func nodesToCreate(cfg *config.Cluster, clusterName string) []nodeSpec {
 			ExtraMounts:      []cri.Mount{},
 			APIServerAddress: cfg.Networking.APIServerAddress,
 			APIServerPort:    cfg.Networking.APIServerPort,
+			IPv6:             ipv6,
 		})
 	}
 

pkg/cluster/nodes/node.go

@@ -284,28 +284,29 @@ func getProxyDetails() proxyDetails {
 
 // EnableIPv6 enables IPv6 inside the node container and in the inner docker daemon
 func (n *Node) EnableIPv6() error {
-	// configure Docker daemon to use ipv6
-	// we take an unused range otherwise the daemon refuse to start
-	// TODO(aojea): Be smarter modifying the daemon.json file
-	err := n.WriteFile("/etc/docker/daemon.json",
-		"{\n\t\"ipv6\": true,\n\t\"fixed-cidr-v6\": \"fc00:db8:1::/64\"\n}")
-	if err != nil {
-		return errors.Wrap(err, "failed to create docker daemon.json")
-	}
-
 	// enable ipv6
 	cmd := n.Command("sysctl", "net.ipv6.conf.all.disable_ipv6=0")
-	err = exec.RunLoggingOutputOnFail(cmd)
+	err := exec.RunLoggingOutputOnFail(cmd)
 	if err != nil {
 		return errors.Wrap(err, "failed to enable ipv6")
 	}
-
 	// enable ipv6 forwarding
 	cmd = n.Command("sysctl", "net.ipv6.conf.all.forwarding=1")
 	err = exec.RunLoggingOutputOnFail(cmd)
 	if err != nil {
 		return errors.Wrap(err, "failed to enable ipv6 forwarding")
 	}
+	// enable ipv6 kubelet
+	_, nodeIPv6, err := n.IP()
+	if err != nil {
+		return errors.Wrap(err, "failed to get IP for node")
+	}
+
+	kubeletExtraConfig := fmt.Sprintf("KUBELET_EXTRA_ARGS=\"--fail-swap-on=false --node-ip=%s\"", nodeIPv6)
+	if err := n.WriteFile("/etc/default/kubelet", kubeletExtraConfig); err != nil {
+		// TODO(bentheelder): logging here
+		return errors.Wrap(err, "failed to copy kubelet extra config to node")
+	}
 
 	return nil
 }