From ee6f03f55a399df16647a93cfff96117044c21e9 Mon Sep 17 00:00:00 2001
From: Chao Xu <xuchao@google.com>
Date: Tue, 19 Jan 2016 22:13:04 -0800
Subject: [PATCH] Fix UpdateStatus

---
 .../client-gen/generators/generator-for-type.go   | 15 +++++++++++----
 .../testoutput/testgroup/unversioned/testtype.go  | 15 +++++++++++----
 .../generated/extensions/unversioned/daemonset.go | 15 +++++++++++----
 .../extensions/unversioned/deployment.go          | 15 +++++++++++----
 .../unversioned/horizontalpodautoscaler.go        | 15 +++++++++++----
 .../generated/extensions/unversioned/ingress.go   | 15 +++++++++++----
 .../typed/generated/extensions/unversioned/job.go | 15 +++++++++++----
 .../generated/legacy/unversioned/namespace.go     | 14 ++++++++++----
 .../typed/generated/legacy/unversioned/node.go    | 14 ++++++++++----
 .../legacy/unversioned/persistentvolume.go        | 14 ++++++++++----
 .../legacy/unversioned/persistentvolumeclaim.go   | 15 +++++++++++----
 .../typed/generated/legacy/unversioned/pod.go     | 15 +++++++++++----
 .../legacy/unversioned/replicationcontroller.go   | 15 +++++++++++----
 .../generated/legacy/unversioned/resourcequota.go | 15 +++++++++++----
 .../typed/generated/legacy/unversioned/service.go | 15 +++++++++++----
 15 files changed, 162 insertions(+), 60 deletions(-)

diff --git a/cmd/libs/go2idl/client-gen/generators/generator-for-type.go b/cmd/libs/go2idl/client-gen/generators/generator-for-type.go
index bea6e3c990..fc11b8d900 100644
--- a/cmd/libs/go2idl/client-gen/generators/generator-for-type.go
+++ b/cmd/libs/go2idl/client-gen/generators/generator-for-type.go
@@ -283,10 +283,17 @@ func (c *$.type|privatePlural$) Update($.type|private$ *$.type|raw$) (result *$.
 `
 
 var updateStatusTemplate = `
-func (c *$.type|privatePlural$) UpdateStatus($.type|private$ *$.type|raw$) (*$.type|raw$, error) {
-	result := &$.type|raw${}
-	err := c.client.Put().Resource("$.type|privatePlural$").Name($.type|private$.Name).SubResource("status").Body($.type|private$).Do().Into(result)
-	return result, err
+func (c *$.type|privatePlural$) UpdateStatus($.type|private$ *$.type|raw$) (result *$.type|raw$, err error) {
+	result = &$.type|raw${}
+	err = c.client.Put().
+		$if .namespaced$Namespace(c.ns).$end$
+		Resource("$.type|privatePlural$").
+		Name($.type|private$.Name).
+		SubResource("status").
+		Body($.type|private$).
+		Do().
+		Into(result)
+	return
 }
 `
 
diff --git a/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testtype.go b/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testtype.go
index 3ca7fb4975..8d068b22db 100644
--- a/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testtype.go
+++ b/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testtype.go
@@ -80,10 +80,17 @@ func (c *testTypes) Update(testType *testgroup.TestType) (result *testgroup.Test
 	return
 }
 
-func (c *testTypes) UpdateStatus(testType *testgroup.TestType) (*testgroup.TestType, error) {
-	result := &testgroup.TestType{}
-	err := c.client.Put().Resource("testTypes").Name(testType.Name).SubResource("status").Body(testType).Do().Into(result)
-	return result, err
+func (c *testTypes) UpdateStatus(testType *testgroup.TestType) (result *testgroup.TestType, err error) {
+	result = &testgroup.TestType{}
+	err = c.client.Put().
+		Namespace(c.ns).
+		Resource("testTypes").
+		Name(testType.Name).
+		SubResource("status").
+		Body(testType).
+		Do().
+		Into(result)
+	return
 }
 
 // Delete takes name of the testType and deletes it. Returns an error if one occurs.
diff --git a/pkg/client/typed/generated/extensions/unversioned/daemonset.go b/pkg/client/typed/generated/extensions/unversioned/daemonset.go
index 350be3616a..8c8e1adda6 100644
--- a/pkg/client/typed/generated/extensions/unversioned/daemonset.go
+++ b/pkg/client/typed/generated/extensions/unversioned/daemonset.go
@@ -80,10 +80,17 @@ func (c *daemonSets) Update(daemonSet *extensions.DaemonSet) (result *extensions
 	return
 }
 
-func (c *daemonSets) UpdateStatus(daemonSet *extensions.DaemonSet) (*extensions.DaemonSet, error) {
-	result := &extensions.DaemonSet{}
-	err := c.client.Put().Resource("daemonSets").Name(daemonSet.Name).SubResource("status").Body(daemonSet).Do().Into(result)
-	return result, err
+func (c *daemonSets) UpdateStatus(daemonSet *extensions.DaemonSet) (result *extensions.DaemonSet, err error) {
+	result = &extensions.DaemonSet{}
+	err = c.client.Put().
+		Namespace(c.ns).
+		Resource("daemonSets").
+		Name(daemonSet.Name).
+		SubResource("status").
+		Body(daemonSet).
+		Do().
+		Into(result)
+	return
 }
 
 // Delete takes name of the daemonSet and deletes it. Returns an error if one occurs.
diff --git a/pkg/client/typed/generated/extensions/unversioned/deployment.go b/pkg/client/typed/generated/extensions/unversioned/deployment.go
index 90e105d273..df9dc1c43a 100644
--- a/pkg/client/typed/generated/extensions/unversioned/deployment.go
+++ b/pkg/client/typed/generated/extensions/unversioned/deployment.go
@@ -80,10 +80,17 @@ func (c *deployments) Update(deployment *extensions.Deployment) (result *extensi
 	return
 }
 
-func (c *deployments) UpdateStatus(deployment *extensions.Deployment) (*extensions.Deployment, error) {
-	result := &extensions.Deployment{}
-	err := c.client.Put().Resource("deployments").Name(deployment.Name).SubResource("status").Body(deployment).Do().Into(result)
-	return result, err
+func (c *deployments) UpdateStatus(deployment *extensions.Deployment) (result *extensions.Deployment, err error) {
+	result = &extensions.Deployment{}
+	err = c.client.Put().
+		Namespace(c.ns).
+		Resource("deployments").
+		Name(deployment.Name).
+		SubResource("status").
+		Body(deployment).
+		Do().
+		Into(result)
+	return
 }
 
 // Delete takes name of the deployment and deletes it. Returns an error if one occurs.
diff --git a/pkg/client/typed/generated/extensions/unversioned/horizontalpodautoscaler.go b/pkg/client/typed/generated/extensions/unversioned/horizontalpodautoscaler.go
index e15861e2dd..50422bdacb 100644
--- a/pkg/client/typed/generated/extensions/unversioned/horizontalpodautoscaler.go
+++ b/pkg/client/typed/generated/extensions/unversioned/horizontalpodautoscaler.go
@@ -80,10 +80,17 @@ func (c *horizontalPodAutoscalers) Update(horizontalPodAutoscaler *extensions.Ho
 	return
 }
 
-func (c *horizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *extensions.HorizontalPodAutoscaler) (*extensions.HorizontalPodAutoscaler, error) {
-	result := &extensions.HorizontalPodAutoscaler{}
-	err := c.client.Put().Resource("horizontalPodAutoscalers").Name(horizontalPodAutoscaler.Name).SubResource("status").Body(horizontalPodAutoscaler).Do().Into(result)
-	return result, err
+func (c *horizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *extensions.HorizontalPodAutoscaler) (result *extensions.HorizontalPodAutoscaler, err error) {
+	result = &extensions.HorizontalPodAutoscaler{}
+	err = c.client.Put().
+		Namespace(c.ns).
+		Resource("horizontalPodAutoscalers").
+		Name(horizontalPodAutoscaler.Name).
+		SubResource("status").
+		Body(horizontalPodAutoscaler).
+		Do().
+		Into(result)
+	return
 }
 
 // Delete takes name of the horizontalPodAutoscaler and deletes it. Returns an error if one occurs.
diff --git a/pkg/client/typed/generated/extensions/unversioned/ingress.go b/pkg/client/typed/generated/extensions/unversioned/ingress.go
index 594e90b36d..c2daa3e5f1 100644
--- a/pkg/client/typed/generated/extensions/unversioned/ingress.go
+++ b/pkg/client/typed/generated/extensions/unversioned/ingress.go
@@ -80,10 +80,17 @@ func (c *ingresses) Update(ingress *extensions.Ingress) (result *extensions.Ingr
 	return
 }
 
-func (c *ingresses) UpdateStatus(ingress *extensions.Ingress) (*extensions.Ingress, error) {
-	result := &extensions.Ingress{}
-	err := c.client.Put().Resource("ingresses").Name(ingress.Name).SubResource("status").Body(ingress).Do().Into(result)
-	return result, err
+func (c *ingresses) UpdateStatus(ingress *extensions.Ingress) (result *extensions.Ingress, err error) {
+	result = &extensions.Ingress{}
+	err = c.client.Put().
+		Namespace(c.ns).
+		Resource("ingresses").
+		Name(ingress.Name).
+		SubResource("status").
+		Body(ingress).
+		Do().
+		Into(result)
+	return
 }
 
 // Delete takes name of the ingress and deletes it. Returns an error if one occurs.
diff --git a/pkg/client/typed/generated/extensions/unversioned/job.go b/pkg/client/typed/generated/extensions/unversioned/job.go
index 5114da420e..5e6cf7f33f 100644
--- a/pkg/client/typed/generated/extensions/unversioned/job.go
+++ b/pkg/client/typed/generated/extensions/unversioned/job.go
@@ -80,10 +80,17 @@ func (c *jobs) Update(job *extensions.Job) (result *extensions.Job, err error) {
 	return
 }
 
-func (c *jobs) UpdateStatus(job *extensions.Job) (*extensions.Job, error) {
-	result := &extensions.Job{}
-	err := c.client.Put().Resource("jobs").Name(job.Name).SubResource("status").Body(job).Do().Into(result)
-	return result, err
+func (c *jobs) UpdateStatus(job *extensions.Job) (result *extensions.Job, err error) {
+	result = &extensions.Job{}
+	err = c.client.Put().
+		Namespace(c.ns).
+		Resource("jobs").
+		Name(job.Name).
+		SubResource("status").
+		Body(job).
+		Do().
+		Into(result)
+	return
 }
 
 // Delete takes name of the job and deletes it. Returns an error if one occurs.
diff --git a/pkg/client/typed/generated/legacy/unversioned/namespace.go b/pkg/client/typed/generated/legacy/unversioned/namespace.go
index 6b203ae269..733f753f3f 100644
--- a/pkg/client/typed/generated/legacy/unversioned/namespace.go
+++ b/pkg/client/typed/generated/legacy/unversioned/namespace.go
@@ -75,10 +75,16 @@ func (c *namespaces) Update(namespace *api.Namespace) (result *api.Namespace, er
 	return
 }
 
-func (c *namespaces) UpdateStatus(namespace *api.Namespace) (*api.Namespace, error) {
-	result := &api.Namespace{}
-	err := c.client.Put().Resource("namespaces").Name(namespace.Name).SubResource("status").Body(namespace).Do().Into(result)
-	return result, err
+func (c *namespaces) UpdateStatus(namespace *api.Namespace) (result *api.Namespace, err error) {
+	result = &api.Namespace{}
+	err = c.client.Put().
+		Resource("namespaces").
+		Name(namespace.Name).
+		SubResource("status").
+		Body(namespace).
+		Do().
+		Into(result)
+	return
 }
 
 // Delete takes name of the namespace and deletes it. Returns an error if one occurs.
diff --git a/pkg/client/typed/generated/legacy/unversioned/node.go b/pkg/client/typed/generated/legacy/unversioned/node.go
index ab5f454d6f..37c087a9c1 100644
--- a/pkg/client/typed/generated/legacy/unversioned/node.go
+++ b/pkg/client/typed/generated/legacy/unversioned/node.go
@@ -75,10 +75,16 @@ func (c *nodes) Update(node *api.Node) (result *api.Node, err error) {
 	return
 }
 
-func (c *nodes) UpdateStatus(node *api.Node) (*api.Node, error) {
-	result := &api.Node{}
-	err := c.client.Put().Resource("nodes").Name(node.Name).SubResource("status").Body(node).Do().Into(result)
-	return result, err
+func (c *nodes) UpdateStatus(node *api.Node) (result *api.Node, err error) {
+	result = &api.Node{}
+	err = c.client.Put().
+		Resource("nodes").
+		Name(node.Name).
+		SubResource("status").
+		Body(node).
+		Do().
+		Into(result)
+	return
 }
 
 // Delete takes name of the node and deletes it. Returns an error if one occurs.
diff --git a/pkg/client/typed/generated/legacy/unversioned/persistentvolume.go b/pkg/client/typed/generated/legacy/unversioned/persistentvolume.go
index 4104947b34..1c22281bf0 100644
--- a/pkg/client/typed/generated/legacy/unversioned/persistentvolume.go
+++ b/pkg/client/typed/generated/legacy/unversioned/persistentvolume.go
@@ -75,10 +75,16 @@ func (c *persistentVolumes) Update(persistentVolume *api.PersistentVolume) (resu
 	return
 }
 
-func (c *persistentVolumes) UpdateStatus(persistentVolume *api.PersistentVolume) (*api.PersistentVolume, error) {
-	result := &api.PersistentVolume{}
-	err := c.client.Put().Resource("persistentVolumes").Name(persistentVolume.Name).SubResource("status").Body(persistentVolume).Do().Into(result)
-	return result, err
+func (c *persistentVolumes) UpdateStatus(persistentVolume *api.PersistentVolume) (result *api.PersistentVolume, err error) {
+	result = &api.PersistentVolume{}
+	err = c.client.Put().
+		Resource("persistentVolumes").
+		Name(persistentVolume.Name).
+		SubResource("status").
+		Body(persistentVolume).
+		Do().
+		Into(result)
+	return
 }
 
 // Delete takes name of the persistentVolume and deletes it. Returns an error if one occurs.
diff --git a/pkg/client/typed/generated/legacy/unversioned/persistentvolumeclaim.go b/pkg/client/typed/generated/legacy/unversioned/persistentvolumeclaim.go
index e05696ac6c..43bcb2eaa6 100644
--- a/pkg/client/typed/generated/legacy/unversioned/persistentvolumeclaim.go
+++ b/pkg/client/typed/generated/legacy/unversioned/persistentvolumeclaim.go
@@ -79,10 +79,17 @@ func (c *persistentVolumeClaims) Update(persistentVolumeClaim *api.PersistentVol
 	return
 }
 
-func (c *persistentVolumeClaims) UpdateStatus(persistentVolumeClaim *api.PersistentVolumeClaim) (*api.PersistentVolumeClaim, error) {
-	result := &api.PersistentVolumeClaim{}
-	err := c.client.Put().Resource("persistentVolumeClaims").Name(persistentVolumeClaim.Name).SubResource("status").Body(persistentVolumeClaim).Do().Into(result)
-	return result, err
+func (c *persistentVolumeClaims) UpdateStatus(persistentVolumeClaim *api.PersistentVolumeClaim) (result *api.PersistentVolumeClaim, err error) {
+	result = &api.PersistentVolumeClaim{}
+	err = c.client.Put().
+		Namespace(c.ns).
+		Resource("persistentVolumeClaims").
+		Name(persistentVolumeClaim.Name).
+		SubResource("status").
+		Body(persistentVolumeClaim).
+		Do().
+		Into(result)
+	return
 }
 
 // Delete takes name of the persistentVolumeClaim and deletes it. Returns an error if one occurs.
diff --git a/pkg/client/typed/generated/legacy/unversioned/pod.go b/pkg/client/typed/generated/legacy/unversioned/pod.go
index 6a9788d501..a5e34218a6 100644
--- a/pkg/client/typed/generated/legacy/unversioned/pod.go
+++ b/pkg/client/typed/generated/legacy/unversioned/pod.go
@@ -79,10 +79,17 @@ func (c *pods) Update(pod *api.Pod) (result *api.Pod, err error) {
 	return
 }
 
-func (c *pods) UpdateStatus(pod *api.Pod) (*api.Pod, error) {
-	result := &api.Pod{}
-	err := c.client.Put().Resource("pods").Name(pod.Name).SubResource("status").Body(pod).Do().Into(result)
-	return result, err
+func (c *pods) UpdateStatus(pod *api.Pod) (result *api.Pod, err error) {
+	result = &api.Pod{}
+	err = c.client.Put().
+		Namespace(c.ns).
+		Resource("pods").
+		Name(pod.Name).
+		SubResource("status").
+		Body(pod).
+		Do().
+		Into(result)
+	return
 }
 
 // Delete takes name of the pod and deletes it. Returns an error if one occurs.
diff --git a/pkg/client/typed/generated/legacy/unversioned/replicationcontroller.go b/pkg/client/typed/generated/legacy/unversioned/replicationcontroller.go
index 0381b22bb8..63662a004f 100644
--- a/pkg/client/typed/generated/legacy/unversioned/replicationcontroller.go
+++ b/pkg/client/typed/generated/legacy/unversioned/replicationcontroller.go
@@ -79,10 +79,17 @@ func (c *replicationControllers) Update(replicationController *api.ReplicationCo
 	return
 }
 
-func (c *replicationControllers) UpdateStatus(replicationController *api.ReplicationController) (*api.ReplicationController, error) {
-	result := &api.ReplicationController{}
-	err := c.client.Put().Resource("replicationControllers").Name(replicationController.Name).SubResource("status").Body(replicationController).Do().Into(result)
-	return result, err
+func (c *replicationControllers) UpdateStatus(replicationController *api.ReplicationController) (result *api.ReplicationController, err error) {
+	result = &api.ReplicationController{}
+	err = c.client.Put().
+		Namespace(c.ns).
+		Resource("replicationControllers").
+		Name(replicationController.Name).
+		SubResource("status").
+		Body(replicationController).
+		Do().
+		Into(result)
+	return
 }
 
 // Delete takes name of the replicationController and deletes it. Returns an error if one occurs.
diff --git a/pkg/client/typed/generated/legacy/unversioned/resourcequota.go b/pkg/client/typed/generated/legacy/unversioned/resourcequota.go
index 6798c5a102..a073e99747 100644
--- a/pkg/client/typed/generated/legacy/unversioned/resourcequota.go
+++ b/pkg/client/typed/generated/legacy/unversioned/resourcequota.go
@@ -79,10 +79,17 @@ func (c *resourceQuotas) Update(resourceQuota *api.ResourceQuota) (result *api.R
 	return
 }
 
-func (c *resourceQuotas) UpdateStatus(resourceQuota *api.ResourceQuota) (*api.ResourceQuota, error) {
-	result := &api.ResourceQuota{}
-	err := c.client.Put().Resource("resourceQuotas").Name(resourceQuota.Name).SubResource("status").Body(resourceQuota).Do().Into(result)
-	return result, err
+func (c *resourceQuotas) UpdateStatus(resourceQuota *api.ResourceQuota) (result *api.ResourceQuota, err error) {
+	result = &api.ResourceQuota{}
+	err = c.client.Put().
+		Namespace(c.ns).
+		Resource("resourceQuotas").
+		Name(resourceQuota.Name).
+		SubResource("status").
+		Body(resourceQuota).
+		Do().
+		Into(result)
+	return
 }
 
 // Delete takes name of the resourceQuota and deletes it. Returns an error if one occurs.
diff --git a/pkg/client/typed/generated/legacy/unversioned/service.go b/pkg/client/typed/generated/legacy/unversioned/service.go
index 13840cbc30..db474a7969 100644
--- a/pkg/client/typed/generated/legacy/unversioned/service.go
+++ b/pkg/client/typed/generated/legacy/unversioned/service.go
@@ -79,10 +79,17 @@ func (c *services) Update(service *api.Service) (result *api.Service, err error)
 	return
 }
 
-func (c *services) UpdateStatus(service *api.Service) (*api.Service, error) {
-	result := &api.Service{}
-	err := c.client.Put().Resource("services").Name(service.Name).SubResource("status").Body(service).Do().Into(result)
-	return result, err
+func (c *services) UpdateStatus(service *api.Service) (result *api.Service, err error) {
+	result = &api.Service{}
+	err = c.client.Put().
+		Namespace(c.ns).
+		Resource("services").
+		Name(service.Name).
+		SubResource("status").
+		Body(service).
+		Do().
+		Into(result)
+	return
 }
 
 // Delete takes name of the service and deletes it. Returns an error if one occurs.