kubernetes: fix, test GetNodes
Broken in my cleanup golang.org/cl/36692
Change-Id: I5f82314b8ff703cf2c894771fbc0eb16834fc47b
Reviewed-on: https://go-review.googlesource.com/37216
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
diff --git a/kubernetes/client.go b/kubernetes/client.go
index a99a5fd..9e42b89 100644
--- a/kubernetes/client.go
+++ b/kubernetes/client.go
@@ -429,7 +429,7 @@
// PodNodes returns the list of nodes that comprise the Kubernetes cluster
func (c *Client) GetNodes(ctx context.Context) ([]api.Node, error) {
var list api.NodeList
- if err := c.do(ctx, "GET", c.nsEndpoint()+"nodes", &list); err != nil {
+ if err := c.do(ctx, "GET", c.endpointURL+"/nodes", &list); err != nil {
return nil, err
}
return list.Items, nil
diff --git a/kubernetes/gke/gke_test.go b/kubernetes/gke/gke_test.go
index fa7fa5f..1891992 100644
--- a/kubernetes/gke/gke_test.go
+++ b/kubernetes/gke/gke_test.go
@@ -150,3 +150,19 @@
kc.Close()
}
}
+
+func TestGetNodes(t *testing.T) {
+ var passed bool
+ ctx := context.Background()
+ foreachCluster(t, func(cl *container.Cluster, kc *kubernetes.Client) {
+ if passed {
+ return
+ }
+ nodes, err := kc.GetNodes(ctx)
+ if err != nil {
+ t.Fatal(err)
+ }
+ t.Logf("%d nodes in cluster %s", len(nodes), cl.Name)
+ passed = true
+ })
+}
