github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #81696 from tedyu/kubeadm-ipv6

Browse Source 
Remove check for addIPv6Checks which evaluates to true
This commit is contained in:
Kubernetes Prow Robot 2019-08-22 22:04:13 -07:00 committed by GitHub
commit 9873f0bfe8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/preflight/checks.go
View File

@ -984,7 +984,6 @@ func RunJoinNodeChecks(execer utilsexec.Interface, cfg *kubeadmapi.JoinConfigura
checks = append(checks,
HTTPProxyCheck{Proto: "https", Host: ipstr},
)
if !addIPv6Checks {
if ip := net.ParseIP(ipstr); ip != nil {
if utilsnet.IsIPv6(ip) {
addIPv6Checks = true
@ -992,7 +991,6 @@ func RunJoinNodeChecks(execer utilsexec.Interface, cfg *kubeadmapi.JoinConfigura
}
}
}
}
if addIPv6Checks {
checks = append(checks,
FileContentCheck{Path: bridgenf6, Content: []byte{'1'}},