Merge pull request #1564 from aojea/restartlb

allow loadbalancer to restart gracefully
kubernetes-sigs · May 6, 2020 · 9ba9cca · 9ba9cca
2 parents 077cd16 + 66536a3
commit 9ba9cca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/pkg/cluster/internal/create/actions/loadbalancer/loadbalancer.go b/pkg/cluster/internal/create/actions/loadbalancer/loadbalancer.go
@@ -22,6 +22,7 @@ import (
 
 	"sigs.k8s.io/kind/pkg/cluster/constants"
 	"sigs.k8s.io/kind/pkg/errors"
+	"sigs.k8s.io/kind/pkg/internal/apis/config"
 
 	"sigs.k8s.io/kind/pkg/cluster/internal/create/actions"
 	"sigs.k8s.io/kind/pkg/cluster/internal/loadbalancer"
@@ -56,12 +57,6 @@ func (a *Action) Execute(ctx *actions.ActionContext) error {
 		return nil
 	}
 
-	// obtain IP family
-	ipv6 := false
-	if ctx.Config.Networking.IPFamily == "ipv6" {
-		ipv6 = true
-	}
-
 	// otherwise notify the user
 	ctx.Status.Start("Configuring the external load balancer ⚖️")
 	defer ctx.Status.End(false)
@@ -76,23 +71,14 @@ func (a *Action) Execute(ctx *actions.ActionContext) error {
 		return err
 	}
 	for _, n := range controlPlaneNodes {
-		controlPlaneIPv4, controlPlaneIPv6, err := n.IP()
-		if err != nil {
-			return errors.Wrapf(err, "failed to get IP for node %s", n.String())
-		}
-		if controlPlaneIPv4 != "" && !ipv6 {
-			backendServers[n.String()] = fmt.Sprintf("%s:%d", controlPlaneIPv4, common.APIServerInternalPort)
-		}
-		if controlPlaneIPv6 != "" && ipv6 {
-			backendServers[n.String()] = fmt.Sprintf("[%s]:%d", controlPlaneIPv6, common.APIServerInternalPort)
-		}
+		backendServers[n.String()] = fmt.Sprintf("%s:%d", n.String(), common.APIServerInternalPort)
 	}
 
 	// create loadbalancer config data
 	loadbalancerConfig, err := loadbalancer.Config(&loadbalancer.ConfigData{
 		ControlPlanePort: common.APIServerInternalPort,
 		BackendServers:   backendServers,
-		IPv6:             ipv6,
+		IPv6:             ctx.Config.Networking.IPFamily == config.IPv6Family,
 	})
 	if err != nil {
 		return errors.Wrap(err, "failed to generate loadbalancer config data")

diff --git a/pkg/cluster/internal/loadbalancer/config.go b/pkg/cluster/internal/loadbalancer/config.go
@@ -37,6 +37,9 @@ global
   log /dev/log local1 notice
   daemon
 
+resolvers docker
+  nameserver dns 127.0.0.11:53
+
 defaults
   log global
   mode tcp
@@ -45,6 +48,8 @@ defaults
   timeout connect 5000
   timeout client 50000
   timeout server 50000
+  # allow to boot despite dns don't resolve backends
+  default-server init-addr none
 
 frontend control-plane
   bind *:{{ .ControlPlanePort }}
@@ -57,7 +62,7 @@ backend kube-apiservers
   option httpchk GET /healthz
   # TODO: we should be verifying (!)
   {{range $server, $address := .BackendServers}}
-  server {{ $server }} {{ $address }} check check-ssl verify none
+  server {{ $server }} {{ $address }} check check-ssl verify none resolvers docker resolve-prefer {{ if $.IPv6 -}} ipv6 {{- else -}} ipv4 {{- end }}
   {{- end}}
 `