scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix panic in kubeadm master node setup

Browse Source
This commit is contained in:
Ivan Shvedunov
2017-04-06 12:30:42 +03:00
parent 5b4a814db2
commit 24b8ed5d84
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/kubeadm/app/phases/apiconfig/setupmaster.go
View File

@@ -43,9 +43,12 @@ func attemptToUpdateMasterRoleLabelsAndTaints(client *clientset.Clientset) error
wait.PollInfinite(kubeadmconstants.APICallRetryInterval, func() (bool, error) {
var err error
if n, err = client.Nodes().Get(node.GetHostname(""), metav1.GetOptions{}); err != nil {
return true, nil
return false, nil
}
return false, nil
// The node may appear to have no labels at first,
// so we wait for it to get hostname label.
_, found := n.ObjectMeta.Labels[metav1.LabelHostname]
return found, nil
})
oldData, err := json.Marshal(n)