Merge pull request kubernetes#4313 from derekwaynecarr/client_watch_n…

…amespaces Add ability to watch namespaces from client
duda · Feb 12, 2015 · 0a435c8 · 0a435c8
2 parents b2d50ce + 73aa0cc
commit 0a435c8
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/pkg/client/fake_namespaces.go b/pkg/client/fake_namespaces.go
@@ -19,6 +19,7 @@ package client
 import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
 )
 
 // FakeNamespaces implements NamespacesInterface. Meant to be embedded into a struct to get a default
@@ -51,3 +52,8 @@ func (c *FakeNamespaces) Update(namespace *api.Namespace) (*api.Namespace, error
 	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "update-namespace", Value: namespace.Name})
 	return &api.Namespace{}, nil
 }
+
+func (c *FakeNamespaces) Watch(label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
+	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "watch-namespaces", Value: resourceVersion})
+	return c.Fake.Watch, nil
+}
diff --git a/pkg/client/namespaces.go b/pkg/client/namespaces.go
@@ -22,6 +22,7 @@ import (
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
 )
 
 type NamespacesInterface interface {
@@ -34,6 +35,7 @@ type NamespaceInterface interface {
 	List(selector labels.Selector) (*api.NamespaceList, error)
 	Delete(name string) error
 	Update(item *api.Namespace) (*api.Namespace, error)
+	Watch(label, field labels.Selector, resourceVersion string) (watch.Interface, error)
 }
 
 // namespaces implements NamespacesInterface
@@ -86,3 +88,14 @@ func (c *namespaces) Get(name string) (*api.Namespace, error) {
 func (c *namespaces) Delete(name string) error {
 	return c.r.Delete().Resource("namespaces").Name(name).Do().Error()
 }
+
+// Watch returns a watch.Interface that watches the requested namespaces.
+func (c *namespaces) Watch(label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
+	return c.r.Get().
+		Prefix("watch").
+		Resource("namespaces").
+		Param("resourceVersion", resourceVersion).
+		SelectorParam("labels", label).
+		SelectorParam("fields", field).
+		Watch()
+}
diff --git a/pkg/client/namespaces_test.go b/pkg/client/namespaces_test.go
@@ -17,6 +17,7 @@ limitations under the License.
 package client
 
 import (
+	"net/url"
 	"testing"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
@@ -132,3 +133,12 @@ func TestNamespaceDelete(t *testing.T) {
 	err := c.Setup().Namespaces().Delete("foo")
 	c.Validate(t, nil, err)
 }
+
+func TestNamespaceWatch(t *testing.T) {
+	c := &testClient{
+		Request:  testRequest{Method: "GET", Path: "/watch/namespaces", Query: url.Values{"resourceVersion": []string{}}},
+		Response: Response{StatusCode: 200},
+	}
+	_, err := c.Setup().Namespaces().Watch(labels.Everything(), labels.Everything(), "")
+	c.Validate(t, nil, err)
+}