github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-21 22:49:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #73987 from vanduc95/cleanup-kubeadm-20190213

Browse Source 
kubeadm cleanup: master -> control-plane
This commit is contained in:
Kubernetes Prow Robot
2019-02-13 23:07:11 -08:00
committed by GitHub
parent d8f0146138 0e8941f7ec
commit 30c7df5cd8
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kubeadm/app/phases/upgrade/health.go
View File

@@ -109,16 +109,16 @@ func masterNodesReady(client clientset.Interface) error {
LabelSelector: selector.String(),
})
if err != nil {
return errors.Wrap(err, "couldn't list masters in cluster")
return errors.Wrap(err, "couldn't list control-planes in cluster")
}
if len(masters.Items) == 0 {
return errors.New("failed to find any nodes with master role")
return errors.New("failed to find any nodes with a control-plane role")
}
notReadyMasters := getNotReadyNodes(masters.Items)
if len(notReadyMasters) != 0 {
return errors.Errorf("there are NotReady masters in the cluster: %v", notReadyMasters)
return errors.Errorf("there are NotReady control-planes in the cluster: %v", notReadyMasters)
}
return nil
}