Rework client.Interface

pkg/client/client.go

@@ -21,64 +21,42 @@ import (
 	"fmt"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/version"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
 )
 
 // Interface holds the methods for clients of Kubernetes,
 // an interface to allow mock testing.
-// TODO: these should return/take pointers.
 type Interface interface {
-	PodInterface
-	ReplicationControllerInterface
-	ServiceInterface
+	PodsNamespacer
+	ReplicationControllersNamespacer
+	ServicesNamespacer
 	VersionInterface
-	MinionInterface
+	MinionsInterface
+	EventsInterface
 }
 
-// PodInterface has methods to work with Pod resources.
-type PodInterface interface {
-	ListPods(ctx api.Context, selector labels.Selector) (*api.PodList, error)
-	GetPod(ctx api.Context, id string) (*api.Pod, error)
-	DeletePod(ctx api.Context, id string) error
-	CreatePod(ctx api.Context, pod *api.Pod) (*api.Pod, error)
-	UpdatePod(ctx api.Context, pod *api.Pod) (*api.Pod, error)
+func (c *Client) ReplicationControllers(namespace string) ReplicationControllerInterface {
+	return NewReplicationControllersClient(c, namespace)
 }
 
-// ReplicationControllerInterface has methods to work with ReplicationController resources.
-type ReplicationControllerInterface interface {
-	ListReplicationControllers(ctx api.Context, selector labels.Selector) (*api.ReplicationControllerList, error)
-	GetReplicationController(ctx api.Context, id string) (*api.ReplicationController, error)
-	CreateReplicationController(ctx api.Context, ctrl *api.ReplicationController) (*api.ReplicationController, error)
-	UpdateReplicationController(ctx api.Context, ctrl *api.ReplicationController) (*api.ReplicationController, error)
-	DeleteReplicationController(ctx api.Context, id string) error
-	WatchReplicationControllers(ctx api.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error)
+func (c *Client) Minions() MinionInterface {
+	return NewMinionsClient(c)
 }
 
-// ServiceInterface has methods to work with Service resources.
-type ServiceInterface interface {
-	ListServices(ctx api.Context, selector labels.Selector) (*api.ServiceList, error)
-	GetService(ctx api.Context, id string) (*api.Service, error)
-	CreateService(ctx api.Context, srv *api.Service) (*api.Service, error)
-	UpdateService(ctx api.Context, srv *api.Service) (*api.Service, error)
-	DeleteService(ctx api.Context, id string) error
-	WatchServices(ctx api.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error)
+func (c *Client) Events() EventInterface {
+	return NewEventsClient(c)
 }
 
-// EndpointsInterface has methods to work with Endpoints resources
-type EndpointsInterface interface {
-	ListEndpoints(ctx api.Context, selector labels.Selector) (*api.EndpointsList, error)
-	GetEndpoints(ctx api.Context, id string) (*api.Endpoints, error)
-	WatchEndpoints(ctx api.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error)
+func (c *Client) Endpoints(namespace string) EndpointsInterface {
+	return NewEndpointsClient(c, namespace)
 }
 
-// EventInterface has methods to work with Event resources
-type EventInterface interface {
-	CreateEvent(event *api.Event) (*api.Event, error)
-	ListEvents(selector labels.Selector) (*api.EventList, error)
-	GetEvent(id string) (*api.Event, error)
-	WatchEvents(label, field labels.Selector, resourceVersion string) (watch.Interface, error)
+func (c *Client) Pods(namespace string) PodInterface {
+	return NewPodsClient(c, namespace)
+}
+
+func (c *Client) Services(namespace string) ServiceInterface {
+	return NewServicesClient(c, namespace)
 }
 
 // VersionInterface has a method to retrieve the server version.
@@ -86,12 +64,6 @@ type VersionInterface interface {
 	ServerVersion() (*version.Info, error)
 }
 
-type MinionInterface interface {
-	CreateMinion(minion *api.Minion) (*api.Minion, error)
-	ListMinions() (*api.MinionList, error)
-	DeleteMinion(id string) error
-}
-
 // APIStatus is exposed by errors that can be converted to an api.Status object
 // for finer grained details.
 type APIStatus interface {
@@ -103,190 +75,6 @@ type Client struct {
 	*RESTClient
 }
 
-// ListPods takes a selector, and returns the list of pods that match that selector.
-func (c *Client) ListPods(ctx api.Context, selector labels.Selector) (result *api.PodList, err error) {
-	result = &api.PodList{}
-	err = c.Get().Namespace(api.Namespace(ctx)).Path("pods").SelectorParam("labels", selector).Do().Into(result)
-	return
-}
-
-// GetPod takes the id of the pod, and returns the corresponding Pod object, and an error if it occurs
-func (c *Client) GetPod(ctx api.Context, id string) (result *api.Pod, err error) {
-	result = &api.Pod{}
-	err = c.Get().Namespace(api.Namespace(ctx)).Path("pods").Path(id).Do().Into(result)
-	return
-}
-
-// DeletePod takes the id of the pod, and returns an error if one occurs
-func (c *Client) DeletePod(ctx api.Context, id string) error {
-	return c.Delete().Namespace(api.Namespace(ctx)).Path("pods").Path(id).Do().Error()
-}
-
-// CreatePod takes the representation of a pod.  Returns the server's representation of the pod, and an error, if it occurs.
-func (c *Client) CreatePod(ctx api.Context, pod *api.Pod) (result *api.Pod, err error) {
-	result = &api.Pod{}
-	err = c.Post().Namespace(api.Namespace(ctx)).Path("pods").Body(pod).Do().Into(result)
-	return
-}
-
-// UpdatePod takes the representation of a pod to update.  Returns the server's representation of the pod, and an error, if it occurs.
-func (c *Client) UpdatePod(ctx api.Context, pod *api.Pod) (result *api.Pod, err error) {
-	result = &api.Pod{}
-	if len(pod.ResourceVersion) == 0 {
-		err = fmt.Errorf("invalid update object, missing resource version: %v", pod)
-		return
-	}
-	err = c.Put().Namespace(api.Namespace(ctx)).Path("pods").Path(pod.Name).Body(pod).Do().Into(result)
-	return
-}
-
-// ListReplicationControllers takes a selector, and returns the list of replication controllers that match that selector.
-func (c *Client) ListReplicationControllers(ctx api.Context, selector labels.Selector) (result *api.ReplicationControllerList, err error) {
-	result = &api.ReplicationControllerList{}
-	err = c.Get().Namespace(api.Namespace(ctx)).Path("replicationControllers").SelectorParam("labels", selector).Do().Into(result)
-	return
-}
-
-// GetReplicationController returns information about a particular replication controller.
-func (c *Client) GetReplicationController(ctx api.Context, id string) (result *api.ReplicationController, err error) {
-	result = &api.ReplicationController{}
-	err = c.Get().Namespace(api.Namespace(ctx)).Path("replicationControllers").Path(id).Do().Into(result)
-	return
-}
-
-// CreateReplicationController creates a new replication controller.
-func (c *Client) CreateReplicationController(ctx api.Context, controller *api.ReplicationController) (result *api.ReplicationController, err error) {
-	result = &api.ReplicationController{}
-	err = c.Post().Namespace(api.Namespace(ctx)).Path("replicationControllers").Body(controller).Do().Into(result)
-	return
-}
-
-// UpdateReplicationController updates an existing replication controller.
-func (c *Client) UpdateReplicationController(ctx api.Context, controller *api.ReplicationController) (result *api.ReplicationController, err error) {
-	result = &api.ReplicationController{}
-	if len(controller.ResourceVersion) == 0 {
-		err = fmt.Errorf("invalid update object, missing resource version: %v", controller)
-		return
-	}
-	err = c.Put().Namespace(api.Namespace(ctx)).Path("replicationControllers").Path(controller.Name).Body(controller).Do().Into(result)
-	return
-}
-
-// DeleteReplicationController deletes an existing replication controller.
-func (c *Client) DeleteReplicationController(ctx api.Context, id string) error {
-	return c.Delete().Namespace(api.Namespace(ctx)).Path("replicationControllers").Path(id).Do().Error()
-}
-
-// WatchReplicationControllers returns a watch.Interface that watches the requested controllers.
-func (c *Client) WatchReplicationControllers(ctx api.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
-	return c.Get().
-		Namespace(api.Namespace(ctx)).
-		Path("watch").
-		Path("replicationControllers").
-		Param("resourceVersion", resourceVersion).
-		SelectorParam("labels", label).
-		SelectorParam("fields", field).
-		Watch()
-}
-
-// ListServices takes a selector, and returns the list of services that match that selector
-func (c *Client) ListServices(ctx api.Context, selector labels.Selector) (result *api.ServiceList, err error) {
-	result = &api.ServiceList{}
-	err = c.Get().Namespace(api.Namespace(ctx)).Path("services").SelectorParam("labels", selector).Do().Into(result)
-	return
-}
-
-// GetService returns information about a particular service.
-func (c *Client) GetService(ctx api.Context, id string) (result *api.Service, err error) {
-	result = &api.Service{}
-	err = c.Get().Namespace(api.Namespace(ctx)).Path("services").Path(id).Do().Into(result)
-	return
-}
-
-// CreateService creates a new service.
-func (c *Client) CreateService(ctx api.Context, svc *api.Service) (result *api.Service, err error) {
-	result = &api.Service{}
-	err = c.Post().Namespace(api.Namespace(ctx)).Path("services").Body(svc).Do().Into(result)
-	return
-}
-
-// UpdateService updates an existing service.
-func (c *Client) UpdateService(ctx api.Context, svc *api.Service) (result *api.Service, err error) {
-	result = &api.Service{}
-	if len(svc.ResourceVersion) == 0 {
-		err = fmt.Errorf("invalid update object, missing resource version: %v", svc)
-		return
-	}
-	err = c.Put().Namespace(api.Namespace(ctx)).Path("services").Path(svc.Name).Body(svc).Do().Into(result)
-	return
-}
-
-// DeleteService deletes an existing service.
-func (c *Client) DeleteService(ctx api.Context, id string) error {
-	return c.Delete().Namespace(api.Namespace(ctx)).Path("services").Path(id).Do().Error()
-}
-
-// WatchServices returns a watch.Interface that watches the requested services.
-func (c *Client) WatchServices(ctx api.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
-	return c.Get().
-		Namespace(api.Namespace(ctx)).
-		Path("watch").
-		Path("services").
-		Param("resourceVersion", resourceVersion).
-		SelectorParam("labels", label).
-		SelectorParam("fields", field).
-		Watch()
-}
-
-// ListEndpoints takes a selector, and returns the list of endpoints that match that selector
-func (c *Client) ListEndpoints(ctx api.Context, selector labels.Selector) (result *api.EndpointsList, err error) {
-	result = &api.EndpointsList{}
-	err = c.Get().Namespace(api.Namespace(ctx)).Path("endpoints").SelectorParam("labels", selector).Do().Into(result)
-	return
-}
-
-// GetEndpoints returns information about the endpoints for a particular service.
-func (c *Client) GetEndpoints(ctx api.Context, id string) (result *api.Endpoints, err error) {
-	result = &api.Endpoints{}
-	err = c.Get().Namespace(api.Namespace(ctx)).Path("endpoints").Path(id).Do().Into(result)
-	return
-}
-
-// WatchEndpoints returns a watch.Interface that watches the requested endpoints for a service.
-func (c *Client) WatchEndpoints(ctx api.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
-	return c.Get().
-		Namespace(api.Namespace(ctx)).
-		Path("watch").
-		Path("endpoints").
-		Param("resourceVersion", resourceVersion).
-		SelectorParam("labels", label).
-		SelectorParam("fields", field).
-		Watch()
-}
-
-// CreateEndpoints creates a new endpoint.
-func (c *Client) CreateEndpoints(ctx api.Context, endpoints *api.Endpoints) (*api.Endpoints, error) {
-	result := &api.Endpoints{}
-	err := c.Post().Namespace(api.Namespace(ctx)).Path("endpoints").Body(endpoints).Do().Into(result)
-	return result, err
-}
-
-// UpdateEndpoints updates an existing endpoint.
-func (c *Client) UpdateEndpoints(ctx api.Context, endpoints *api.Endpoints) (*api.Endpoints, error) {
-	result := &api.Endpoints{}
-	if len(endpoints.ResourceVersion) == 0 {
-		return nil, fmt.Errorf("invalid update object, missing resource version: %v", endpoints)
-	}
-	err := c.Put().
-		Namespace(api.Namespace(ctx)).
-		Path("endpoints").
-		Path(endpoints.Name).
-		Body(endpoints).
-		Do().
-		Into(result)
-	return result, err
-}
-
 // ServerVersion retrieves and parses the server's version.
 func (c *Client) ServerVersion() (*version.Info, error) {
 	body, err := c.Get().AbsPath("/version").Do().Raw()
@@ -300,66 +88,3 @@ func (c *Client) ServerVersion() (*version.Info, error) {
 	}
 	return &info, nil
 }
-
-// CreateMinion creates a new minion.
-func (c *Client) CreateMinion(minion *api.Minion) (*api.Minion, error) {
-	result := &api.Minion{}
-	err := c.Post().Path("minions").Body(minion).Do().Into(result)
-	return result, err
-}
-
-// ListMinions lists all the minions in the cluster.
-func (c *Client) ListMinions() (*api.MinionList, error) {
-	result := &api.MinionList{}
-	err := c.Get().Path("minions").Do().Into(result)
-	return result, err
-}
-
-// GetMinion returns information about a particular minion.
-func (c *Client) GetMinion(id string) (*api.Minion, error) {
-	result := &api.Minion{}
-	err := c.Get().Path("minions").Path(id).Do().Into(result)
-	return result, err
-}
-
-// DeleteMinion deletes an existing minion.
-func (c *Client) DeleteMinion(id string) error {
-	return c.Delete().Path("minions").Path(id).Do().Error()
-}
-
-// CreateEvent makes a new event. Returns the copy of the event the server returns, or an error.
-func (c *Client) CreateEvent(event *api.Event) (*api.Event, error) {
-	result := &api.Event{}
-	err := c.Post().Path("events").Body(event).Do().Into(result)
-	return result, err
-}
-
-// ListEvents returns a list of events matching the selectors.
-func (c *Client) ListEvents(label, field labels.Selector) (*api.EventList, error) {
-	result := &api.EventList{}
-	err := c.Get().
-		Path("events").
-		SelectorParam("labels", label).
-		SelectorParam("fields", field).
-		Do().
-		Into(result)
-	return result, err
-}
-
-// GetEvent returns the given event, or an error.
-func (c *Client) GetEvent(id string) (*api.Event, error) {
-	result := &api.Event{}
-	err := c.Get().Path("events").Path(id).Do().Into(result)
-	return result, err
-}
-
-// WatchEvents starts watching for events matching the given selectors.
-func (c *Client) WatchEvents(label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
-	return c.Get().
-		Path("watch").
-		Path("events").
-		Param("resourceVersion", resourceVersion).
-		SelectorParam("labels", label).
-		SelectorParam("fields", field).
-		Watch()
-}

pkg/client/conditions.go

@@ -26,8 +26,7 @@ import (
 // for a controller's ReplicaSelector equals the Replicas count.
 func (c *Client) ControllerHasDesiredReplicas(controller api.ReplicationController) wait.ConditionFunc {
 	return func() (bool, error) {
-		ctx := api.WithNamespace(api.NewContext(), controller.Namespace)
-		pods, err := c.ListPods(ctx, labels.Set(controller.DesiredState.ReplicaSelector).AsSelector())
+		pods, err := c.Pods(controller.Namespace).List(labels.Set(controller.DesiredState.ReplicaSelector).AsSelector())
 		if err != nil {
 			return false, err
 		}

pkg/client/endpoints.go

@@ -0,0 +1,98 @@
+/*
+Copyright 2014 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package client
+
+import (
+	"fmt"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
+)
+
+// EndpointsNamespacer has methods to work with Endpoint resources in a namespace
+type EndpointsNamespacer interface {
+	Endpoint(namespace string) EndpointsInterface
+}
+
+// EndpointsInterface has methods to work with Endpoints resources
+type EndpointsInterface interface {
+	Create(endpoints *api.Endpoints) (*api.Endpoints, error)
+	List(selector labels.Selector) (*api.EndpointsList, error)
+	Get(id string) (*api.Endpoints, error)
+	Update(endpoints *api.Endpoints) (*api.Endpoints, error)
+	Watch(label, field labels.Selector, resourceVersion string) (watch.Interface, error)
+}
+
+// EndpointsClient implements EndpointsNamespacer interface
+type EndpointsClient struct {
+	r  *Client
+	ns string
+}
+
+// NewEndpointsClient returns a EndpointsClient
+func NewEndpointsClient(c *Client, namespace string) *EndpointsClient {
+	return &EndpointsClient{c, namespace}
+}
+
+// Create creates a new endpoint.
+func (c *EndpointsClient) Create(endpoints *api.Endpoints) (*api.Endpoints, error) {
+	result := &api.Endpoints{}
+	err := c.r.Post().Namespace(c.ns).Path("endpoints").Body(endpoints).Do().Into(result)
+	return result, err
+}
+
+// List takes a selector, and returns the list of endpoints that match that selector
+func (c *EndpointsClient) List(selector labels.Selector) (result *api.EndpointsList, err error) {
+	result = &api.EndpointsList{}
+	err = c.r.Get().Namespace(c.ns).Path("endpoints").SelectorParam("labels", selector).Do().Into(result)
+	return
+}
+
+// Get returns information about the endpoints for a particular service.
+func (c *EndpointsClient) Get(id string) (result *api.Endpoints, err error) {
+	result = &api.Endpoints{}
+	err = c.r.Get().Namespace(c.ns).Path("endpoints").Path(id).Do().Into(result)
+	return
+}
+
+// Watch returns a watch.Interface that watches the requested endpoints for a service.
+func (c *EndpointsClient) Watch(label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
+	return c.r.Get().
+		Namespace(c.ns).
+		Path("watch").
+		Path("endpoints").
+		Param("resourceVersion", resourceVersion).
+		SelectorParam("labels", label).
+		SelectorParam("fields", field).
+		Watch()
+}
+
+func (c *EndpointsClient) Update(endpoints *api.Endpoints) (*api.Endpoints, error) {
+	result := &api.Endpoints{}
+	if len(endpoints.ResourceVersion) == 0 {
+		return nil, fmt.Errorf("invalid update object, missing resource version: %v", endpoints)
+	}
+	err := c.r.Put().
+		Namespace(c.ns).
+		Path("endpoints").
+		Path(endpoints.Name).
+		Body(endpoints).
+		Do().
+		Into(result)
+	return result, err
+}

pkg/client/events.go

@@ -0,0 +1,85 @@
+/*
+Copyright 2014 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package client
+
+import (
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
+)
+
+// Events has methods to work with Event resources
+type EventsInterface interface {
+	Events() EventInterface
+}
+
+// EventInterface has methods to work with Event resources
+type EventInterface interface {
+	Create(event *api.Event) (*api.Event, error)
+	List(label, field labels.Selector) (*api.EventList, error)
+	Get(id string) (*api.Event, error)
+	Watch(label, field labels.Selector, resourceVersion string) (watch.Interface, error)
+}
+
+// EventsClient implements Events interface
+type EventsClient struct {
+	r *Client
+}
+
+// NewEventsClient returns a EventsClient
+func NewEventsClient(c *Client) *EventsClient {
+	return &EventsClient{
+		r: c,
+	}
+}
+
+// Create makes a new event. Returns the copy of the event the server returns, or an error.
+func (c *EventsClient) Create(event *api.Event) (*api.Event, error) {
+	result := &api.Event{}
+	err := c.r.Post().Path("events").Body(event).Do().Into(result)
+	return result, err
+}
+
+// List returns a list of events matching the selectors.
+func (c *EventsClient) List(label, field labels.Selector) (*api.EventList, error) {
+	result := &api.EventList{}
+	err := c.r.Get().
+		Path("events").
+		SelectorParam("labels", label).
+		SelectorParam("fields", field).
+		Do().
+		Into(result)
+	return result, err
+}
+
+// Get returns the given event, or an error.
+func (c *EventsClient) Get(id string) (*api.Event, error) {
+	result := &api.Event{}
+	err := c.r.Get().Path("events").Path(id).Do().Into(result)
+	return result, err
+}
+
+// Watch starts watching for events matching the given selectors.
+func (c *EventsClient) Watch(label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
+	return c.r.Get().
+		Path("watch").
+		Path("events").
+		Param("resourceVersion", resourceVersion).
+		SelectorParam("labels", label).
+		SelectorParam("fields", field).
+		Watch()
+}

pkg/client/minions.go

@@ -0,0 +1,68 @@
+/*
+Copyright 2014 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package client
+
+import (
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+)
+
+type MinionsInterface interface {
+	Minions() MinionInterface
+}
+
+type MinionInterface interface {
+	Get(id string) (result *api.Minion, err error)
+	Create(minion *api.Minion) (*api.Minion, error)
+	List() (*api.MinionList, error)
+	Delete(id string) error
+}
+
+// MinionsClient implements Minions interface
+type MinionsClient struct {
+	r *Client
+}
+
+// NewMinionsClient returns a MinionsClient
+func NewMinionsClient(c *Client) *MinionsClient {
+	return &MinionsClient{c}
+}
+
+// Create creates a new minion.
+func (c *MinionsClient) Create(minion *api.Minion) (*api.Minion, error) {
+	result := &api.Minion{}
+	err := c.r.Post().Path("minions").Body(minion).Do().Into(result)
+	return result, err
+}
+
+// List lists all the minions in the cluster.
+func (c *MinionsClient) List() (result *api.MinionList, err error) {
+	result = &api.MinionList{}
+	err = c.r.Get().Path("minions").Do().Into(result)
+	return
+}
+
+// Get gets an existing minion
+func (c *MinionsClient) Get(id string) (result *api.Minion, err error) {
+	result = &api.Minion{}
+	err = c.r.Get().Path("minions").Path(id).Do().Into(result)
+	return
+}
+
+// Delete deletes an existing minion.
+func (c *MinionsClient) Delete(id string) error {
+	return c.r.Delete().Path("minions").Path(id).Do().Error()
+}

pkg/client/pods.go

@@ -0,0 +1,89 @@
+/*
+Copyright 2014 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package client
+
+import (
+	"fmt"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
+)
+
+// PodsNamespacer has methods to work with Pod resources in a namespace
+type PodsNamespacer interface {
+	Pods(namespace string) PodInterface
+}
+
+// PodInterface has methods to work with Pod resources.
+type PodInterface interface {
+	List(selector labels.Selector) (*api.PodList, error)
+	Get(name string) (*api.Pod, error)
+	Delete(name string) error
+	Create(pod *api.Pod) (*api.Pod, error)
+	Update(pod *api.Pod) (*api.Pod, error)
+}
+
+// PodsClient implements PodsNamespacer interface
+type PodsClient struct {
+	r  *Client
+	ns string
+}
+
+// NewPodsClient returns a PodsClient
+func NewPodsClient(c *Client, namespace string) *PodsClient {
+	return &PodsClient{
+		r:  c,
+		ns: namespace,
+	}
+}
+
+// ListPods takes a selector, and returns the list of pods that match that selector.
+func (c *PodsClient) List(selector labels.Selector) (result *api.PodList, err error) {
+	result = &api.PodList{}
+	err = c.r.Get().Namespace(c.ns).Path("pods").SelectorParam("labels", selector).Do().Into(result)
+	return
+}
+
+// GetPod takes the name of the pod, and returns the corresponding Pod object, and an error if it occurs
+func (c *PodsClient) Get(name string) (result *api.Pod, err error) {
+	result = &api.Pod{}
+	err = c.r.Get().Namespace(c.ns).Path("pods").Path(name).Do().Into(result)
+	return
+}
+
+// DeletePod takes the name of the pod, and returns an error if one occurs
+func (c *PodsClient) Delete(name string) error {
+	return c.r.Delete().Namespace(c.ns).Path("pods").Path(name).Do().Error()
+}
+
+// CreatePod takes the representation of a pod.  Returns the server's representation of the pod, and an error, if it occurs.
+func (c *PodsClient) Create(pod *api.Pod) (result *api.Pod, err error) {
+	result = &api.Pod{}
+	err = c.r.Post().Namespace(c.ns).Path("pods").Body(pod).Do().Into(result)
+	return
+}
+
+// UpdatePod takes the representation of a pod to update.  Returns the server's representation of the pod, and an error, if it occurs.
+func (c *PodsClient) Update(pod *api.Pod) (result *api.Pod, err error) {
+	result = &api.Pod{}
+	if len(pod.ResourceVersion) == 0 {
+		err = fmt.Errorf("invalid update object, missing resource version: %v", pod)
+		return
+	}
+	err = c.r.Put().Namespace(c.ns).Path("pods").Path(pod.Name).Body(pod).Do().Into(result)
+	return
+}

pkg/client/record/event.go

@@ -30,7 +30,7 @@ import (
 
 // EventRecorder knows how to store events (client.Client implements it.)
 type EventRecorder interface {
-	CreateEvent(event *api.Event) (*api.Event, error)
+	Create(event *api.Event) (*api.Event, error)
 }
 
 // StartRecording starts sending events to recorder. Call once while initializing
@@ -44,7 +44,7 @@ func StartRecording(recorder EventRecorder, sourceName string) watch.Interface {
 		event = &eventCopy
 		event.Source = sourceName
 		for {
-			_, err := recorder.CreateEvent(event)
+			_, err := recorder.Create(event)
 			if err == nil {
 				break
 			}

pkg/client/replication_controllers.go

@@ -0,0 +1,100 @@
+/*
+Copyright 2014 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package client
+
+import (
+	"fmt"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
+)
+
+// ReplicationControllersNamespacer has methods to work with ReplicationController resources in a namespace
+type ReplicationControllersNamespacer interface {
+	ReplicationControllers(namespace string) ReplicationControllerInterface
+}
+
+// ReplicationControllerInterface has methods to work with ReplicationController resources.
+type ReplicationControllerInterface interface {
+	List(selector labels.Selector) (*api.ReplicationControllerList, error)
+	Get(name string) (*api.ReplicationController, error)
+	Create(ctrl *api.ReplicationController) (*api.ReplicationController, error)
+	Update(ctrl *api.ReplicationController) (*api.ReplicationController, error)
+	Delete(name string) error
+	Watch(label, field labels.Selector, resourceVersion string) (watch.Interface, error)
+}
+
+// ReplicationControllersClient implements ReplicationControllersNamespacer interface
+type ReplicationControllersClient struct {
+	r  *Client
+	ns string
+}
+
+// NewReplicationControllersClient returns a PodsClient
+func NewReplicationControllersClient(c *Client, namespace string) *ReplicationControllersClient {
+	return &ReplicationControllersClient{c, namespace}
+}
+
+// List takes a selector, and returns the list of replication controllers that match that selector.
+func (c *ReplicationControllersClient) List(selector labels.Selector) (result *api.ReplicationControllerList, err error) {
+	result = &api.ReplicationControllerList{}
+	err = c.r.Get().Namespace(c.ns).Path("replicationControllers").SelectorParam("labels", selector).Do().Into(result)
+	return
+}
+
+// Get returns information about a particular replication controller.
+func (c *ReplicationControllersClient) Get(name string) (result *api.ReplicationController, err error) {
+	result = &api.ReplicationController{}
+	err = c.r.Get().Namespace(c.ns).Path("replicationControllers").Path(name).Do().Into(result)
+	return
+}
+
+// Create creates a new replication controller.
+func (c *ReplicationControllersClient) Create(controller *api.ReplicationController) (result *api.ReplicationController, err error) {
+	result = &api.ReplicationController{}
+	err = c.r.Post().Namespace(c.ns).Path("replicationControllers").Body(controller).Do().Into(result)
+	return
+}
+
+// Update updates an existing replication controller.
+func (c *ReplicationControllersClient) Update(controller *api.ReplicationController) (result *api.ReplicationController, err error) {
+	result = &api.ReplicationController{}
+	if len(controller.ResourceVersion) == 0 {
+		err = fmt.Errorf("invalid update object, missing resource version: %v", controller)
+		return
+	}
+	err = c.r.Put().Namespace(c.ns).Path("replicationControllers").Path(controller.Name).Body(controller).Do().Into(result)
+	return
+}
+
+// Delete deletes an existing replication controller.
+func (c *ReplicationControllersClient) Delete(name string) error {
+	return c.r.Delete().Namespace(c.ns).Path("replicationControllers").Path(name).Do().Error()
+}
+
+// Watch returns a watch.Interface that watches the requested controllers.
+func (c *ReplicationControllersClient) Watch(label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
+	return c.r.Get().
+		Namespace(c.ns).
+		Path("watch").
+		Path("replicationControllers").
+		Param("resourceVersion", resourceVersion).
+		SelectorParam("labels", label).
+		SelectorParam("fields", field).
+		Watch()
+}

pkg/client/services.go

@@ -0,0 +1,100 @@
+/*
+Copyright 2014 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package client
+
+import (
+	"fmt"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
+)
+
+// ServicesNamespacer has methods to work with Service resources in a namespace
+type ServicesNamespacer interface {
+	Services(namespace string) ServiceInterface
+}
+
+// ServiceInterface has methods to work with Service resources.
+type ServiceInterface interface {
+	List(selector labels.Selector) (*api.ServiceList, error)
+	Get(name string) (*api.Service, error)
+	Create(srv *api.Service) (*api.Service, error)
+	Update(srv *api.Service) (*api.Service, error)
+	Delete(name string) error
+	Watch(label, field labels.Selector, resourceVersion string) (watch.Interface, error)
+}
+
+// ServicesClient implements PodsNamespacer interface
+type ServicesClient struct {
+	r  *Client
+	ns string
+}
+
+// NewServicesClient returns a PodsClient
+func NewServicesClient(c *Client, namespace string) *ServicesClient {
+	return &ServicesClient{c, namespace}
+}
+
+// List takes a selector, and returns the list of services that match that selector
+func (c *ServicesClient) List(selector labels.Selector) (result *api.ServiceList, err error) {
+	result = &api.ServiceList{}
+	err = c.r.Get().Namespace(c.ns).Path("services").SelectorParam("labels", selector).Do().Into(result)
+	return
+}
+
+// Get returns information about a particular service.
+func (c *ServicesClient) Get(name string) (result *api.Service, err error) {
+	result = &api.Service{}
+	err = c.r.Get().Namespace(c.ns).Path("services").Path(name).Do().Into(result)
+	return
+}
+
+// Create creates a new service.
+func (c *ServicesClient) Create(svc *api.Service) (result *api.Service, err error) {
+	result = &api.Service{}
+	err = c.r.Post().Namespace(c.ns).Path("services").Body(svc).Do().Into(result)
+	return
+}
+
+// Update updates an existing service.
+func (c *ServicesClient) Update(svc *api.Service) (result *api.Service, err error) {
+	result = &api.Service{}
+	if len(svc.ResourceVersion) == 0 {
+		err = fmt.Errorf("invalid update object, missing resource version: %v", svc)
+		return
+	}
+	err = c.r.Put().Namespace(c.ns).Path("services").Path(svc.Name).Body(svc).Do().Into(result)
+	return
+}
+
+// Delete deletes an existing service.
+func (c *ServicesClient) Delete(name string) error {
+	return c.r.Delete().Namespace(c.ns).Path("services").Path(name).Do().Error()
+}
+
+// Watch returns a watch.Interface that watches the requested services.
+func (c *ServicesClient) Watch(label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
+	return c.r.Get().
+		Namespace(c.ns).
+		Path("watch").
+		Path("services").
+		Param("resourceVersion", resourceVersion).
+		SelectorParam("labels", label).
+		SelectorParam("fields", field).
+		Watch()
+}