Browse code
Fix oadm diagnostic (master-node check for ovs plugin) to retrieve the list of nodes running on the same machine as master.
Avesh Agarwal authored on 2016/03/25 05:16:56Showing 1 changed files
| ... | ... |
@@ -9,7 +9,6 @@ import ( |
| 9 | 9 |
|
| 10 | 10 |
kapi "k8s.io/kubernetes/pkg/api" |
| 11 | 11 |
kclient "k8s.io/kubernetes/pkg/client/unversioned" |
| 12 |
- "k8s.io/kubernetes/pkg/labels" |
|
| 13 | 12 |
|
| 14 | 13 |
authorizationapi "github.com/openshift/origin/pkg/authorization/api" |
| 15 | 14 |
osclient "github.com/openshift/origin/pkg/client" |
| ... | ... |
@@ -94,7 +93,7 @@ func (d *MasterNode) CanRun() (bool, error) {
|
| 94 | 94 |
func (d *MasterNode) Check() types.DiagnosticResult {
|
| 95 | 95 |
r := types.NewDiagnosticResult(MasterNodeName) |
| 96 | 96 |
|
| 97 |
- nodes, err := d.KubeClient.Nodes().List(kapi.ListOptions{LabelSelector: labels.Nothing()})
|
|
| 97 |
+ nodes, err := d.KubeClient.Nodes().List(kapi.ListOptions{})
|
|
| 98 | 98 |
if err != nil {
|
| 99 | 99 |
r.Error("DClu3002", err, fmt.Sprintf(clientErrorGettingNodes, err))
|
| 100 | 100 |
return r |