HAProxy restart finish.

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>

Author: tao12345666333

pkg/cluster/internal/create/actions/loadbalancer/haproxy.go

@@ -65,11 +65,22 @@ func (a *Action) Execute(ctx *actions.ActionContext) error {
 		return err
 	}
 
+	// starts a docker container with HA proxy load balancer
+	if err := loadBalancerNode.Command(
+		"/bin/sh", "-c",
+		fmt.Sprintf(
+			"docker run -d -v /kind/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro --network host --restart always --name haproxy %s",
+			haproxy.Image,
+		),
+	).Run(); err != nil {
+		return errors.Wrap(err, "failed to start haproxy")
+	}
+
 	ctx.Status.End(true)
 	return nil
 }
 
-// ConfigHAProxy is common method for HAProxy
+// ConfigHAProxy is common method for write HAProxy's config file
 func ConfigHAProxy(loadBalancerNode *nodes.Node, allNodes []nodes.Node) error {
 	// collect info about the existing controlplane nodes
 	var backendServers = map[string]string{}
@@ -103,16 +114,5 @@ func ConfigHAProxy(loadBalancerNode *nodes.Node, allNodes []nodes.Node) error {
 		return errors.Wrap(err, "failed to copy haproxy config to node")
 	}
 
-	// starts a docker container with HA proxy load balancer
-	if err := loadBalancerNode.Command(
-		"/bin/sh", "-c",
-		fmt.Sprintf(
-			"docker run -d -v /kind/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro --network host --restart always --name haproxy %s",
-			haproxy.Image,
-		),
-	).Run(); err != nil {
-		return errors.Wrap(err, "failed to start haproxy")
-	}
-
 	return nil
 }

pkg/cluster/internal/restart/restart.go

@@ -20,15 +20,39 @@ import (
 	"github.com/pkg/errors"
 
 	"sigs.k8s.io/kind/pkg/cluster/internal/context"
+	"sigs.k8s.io/kind/pkg/cluster/internal/create/actions/loadbalancer"
 	"sigs.k8s.io/kind/pkg/cluster/nodes"
 )
 
 // Cluster restarts the cluster identified by ctx
 func Cluster(c *context.Context) error {
-	n, err := c.ListNodes()
+	allNodes, err := c.ListNodes()
 	if err != nil {
 		return errors.Wrap(err, "error listing nodes")
 	}
 
-	return nodes.Restart(n)
+	// restart all of cluster's nodes.
+	err = nodes.Restart(allNodes)
+	if err != nil {
+		return errors.Wrap(err, "error restarting nodes")
+	}
+
+	// after we execute docker restart, the IP inside the container may be changed.
+	// we should change config.
+	loadBalancerNode, err := nodes.ExternalLoadBalancerNode(allNodes)
+	if err != nil {
+		return err
+	}
+
+	// if there is no external load balancer
+	if loadBalancerNode == nil {
+		return nil
+	}
+
+	err = loadbalancer.ConfigHAProxy(loadBalancerNode, allNodes)
+	if err != nil {
+		return err
+	}
+
+	return nil
 }

pkg/cluster/nodes/nodes.go

@@ -173,7 +173,7 @@ func Restart(nodes []Node) error {
 			return err
 		}
 
-		if !node.WaitForDocker(time.Now().Add(time.Second * 30)) {
+		if !node.WaitForDocker(time.Now().Add(time.Second * 60)) {
 			return errors.Errorf("timed out waiting for docker to be ready on node %s", node.Name())
 		}
 	}