Merge pull request #58815 from bart0sh/PR0002-join-checks

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix adding FileContentCheck **What this PR does / why we need it**: Current code adds FileContentCheck only for the first API Server mentioned in the command line. The test is never added as net.ParseIP always fails because address:port is passed to it instead of just an address. Fixed both issues by introducing a loop over all API Servers and splitting address:port before passing address to the net.ParseIP API. **Release note**: ```release-note NONE ```

Merge pull request #58815 from bart0sh/PR0002-join-checks
0cdd940f · Kubernetes Submit Queue · GitHub · 1150de9c · d503b807 · 0cdd940f
Unverified Commit 0cdd940f authored Jan 31, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 31, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

checks.go cmd/kubeadm/app/preflight/checks.go +10 -6

No files found.
--- a/cmd/kubeadm/app/preflight/checks.go
+++ b/cmd/kubeadm/app/preflight/checks.go
@@ -1002,12 +1002,16 @@ func RunJoinNodeChecks(execer utilsexec.Interface, cfg *kubeadmapi.NodeConfigura
 			criCtlChecker)
 	}
-	if len(cfg.DiscoveryTokenAPIServers) > 0 {
+	for _, server := range cfg.DiscoveryTokenAPIServers {
-		if ip := net.ParseIP(cfg.DiscoveryTokenAPIServers[0]); ip != nil {
+		ipstr, _, err := net.SplitHostPort(server)
-			if ip.To4() == nil && ip.To16() != nil {
+		if err == nil {
-				checks = append(checks,
+			if ip := net.ParseIP(ipstr); ip != nil {
-					FileContentCheck{Path: bridgenf6, Content: []byte{'1'}},
+				if ip.To4() == nil && ip.To16() != nil {
-				)
+					checks = append(checks,
+						FileContentCheck{Path: bridgenf6, Content: []byte{'1'}},
+					)
+					break // Ensure that check is added only once
+				}
 			}
 		}
 	}