github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6146 from kazegusuri/node_client_label

Browse Source 
List in NodesInterface takes label selector
This commit is contained in:
David Oppenheimer
2015-04-08 14:22:53 -07:00
parent c4cbc9bc46 d04cc5ced4
commit 4ffc2aad21
14 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/cadvisor.go
View File

@@ -21,6 +21,7 @@ import (
"time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
. "github.com/onsi/ginkgo"
)
@@ -47,7 +48,7 @@ var _ = Describe("Cadvisor", func() {
func CheckCadvisorHealthOnAllNodes(c *client.Client, timeout time.Duration) {
By("getting list of nodes")
nodeList, err := c.Nodes().List()
nodeList, err := c.Nodes().List(labels.Everything())
expectNoError(err)
var errors []error
retries := maxRetries

2
test/e2e/density.go
View File

@@ -189,7 +189,7 @@ var _ = Describe("Density", func() {
var err error
c, err = loadClient()
expectNoError(err)
minions, err := c.Nodes().List()
minions, err := c.Nodes().List(labels.Everything())
expectNoError(err)
minionCount = len(minions.Items)
Expect(minionCount).NotTo(BeZero())

2
test/e2e/es_cluster_logging.go
View File

@@ -163,7 +163,7 @@ func ClusterLevelLoggingWithElasticsearch(c *client.Client) {
}
// Obtain a list of nodes so we can place one synthetic logger on each node.
nodes, err := c.Nodes().List()
nodes, err := c.Nodes().List(labels.Everything())
if err != nil {
Failf("Failed to list nodes: %v", err)
}

2
test/e2e/monitoring.go
View File

@@ -121,7 +121,7 @@ func expectedServicesExist(c *client.Client) error {
}
func getAllNodesInCluster(c *client.Client) ([]string, error) {
nodeList, err := c.Nodes().List()
nodeList, err := c.Nodes().List(labels.Everything())
if err != nil {
return nil, err
}

3
test/e2e/networking.go
View File

@@ -23,6 +23,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
. "github.com/onsi/ginkgo"
@@ -159,7 +160,7 @@ var _ = Describe("Networking", func() {
By("Creating a webserver (pending) pod on each node")
nodes, err := c.Nodes().List()
nodes, err := c.Nodes().List(labels.Everything())
if err != nil {
Failf("Failed to list nodes: %v", err)
}

3
test/e2e/pd.go
View File

@@ -24,6 +24,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
@@ -45,7 +46,7 @@ var _ = Describe("PD", func() {
podClient = c.Pods(api.NamespaceDefault)
nodes, err := c.Nodes().List()
nodes, err := c.Nodes().List(labels.Everything())
expectNoError(err, "Failed to list nodes for e2e cluster.")
Expect(len(nodes.Items) >= 2).To(BeTrue())

3
test/soak/serve_hostnames/serve_hostnames.go
View File

@@ -35,6 +35,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd"
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/golang/glog"
)
@@ -87,7 +88,7 @@ func main() {
var nodes *api.NodeList
for start := time.Now(); time.Since(start) < nodeListTimeout; time.Sleep(2 * time.Second) {
nodes, err = c.Nodes().List()
nodes, err = c.Nodes().List(labels.Everything())
if err == nil {
break
}