From a198bbb0ae48fe408a6b3b3f409101f0bb3dc5b0 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Wed, 20 Aug 2014 10:21:49 -0700 Subject: [PATCH] Switch api.Status to *api.Status in a bunch of places. --- pkg/apiserver/operation.go | 2 +- pkg/registry/controller/storage.go | 2 +- pkg/registry/pod/storage.go | 2 +- pkg/registry/service/storage.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/apiserver/operation.go b/pkg/apiserver/operation.go index 2a102ae09c..62677c1f33 100644 --- a/pkg/apiserver/operation.go +++ b/pkg/apiserver/operation.go @@ -190,7 +190,7 @@ func (op *Operation) StatusOrResult() (description interface{}, finished bool) { defer op.lock.Unlock() if op.finished == nil { - return api.Status{ + return &api.Status{ Status: api.StatusWorking, Reason: api.ReasonTypeWorking, Details: &api.StatusDetails{ID: op.ID, Kind: "operation"}, diff --git a/pkg/registry/controller/storage.go b/pkg/registry/controller/storage.go index 6eb90f14b5..e1f3c762a3 100644 --- a/pkg/registry/controller/storage.go +++ b/pkg/registry/controller/storage.go @@ -77,7 +77,7 @@ func (rs *RegistryStorage) Create(obj interface{}) (<-chan interface{}, error) { // Delete asynchronously deletes the ReplicationController specified by its id. func (rs *RegistryStorage) Delete(id string) (<-chan interface{}, error) { return apiserver.MakeAsync(func() (interface{}, error) { - return api.Status{Status: api.StatusSuccess}, rs.registry.DeleteController(id) + return &api.Status{Status: api.StatusSuccess}, rs.registry.DeleteController(id) }), nil } diff --git a/pkg/registry/pod/storage.go b/pkg/registry/pod/storage.go index 85f64eea2f..a24033a296 100644 --- a/pkg/registry/pod/storage.go +++ b/pkg/registry/pod/storage.go @@ -91,7 +91,7 @@ func (rs *RegistryStorage) Create(obj interface{}) (<-chan interface{}, error) { func (rs *RegistryStorage) Delete(id string) (<-chan interface{}, error) { return apiserver.MakeAsync(func() (interface{}, error) { - return api.Status{Status: api.StatusSuccess}, rs.registry.DeletePod(id) + return &api.Status{Status: api.StatusSuccess}, rs.registry.DeletePod(id) }), nil } diff --git a/pkg/registry/service/storage.go b/pkg/registry/service/storage.go index bff4545aa5..785c78c8b4 100644 --- a/pkg/registry/service/storage.go +++ b/pkg/registry/service/storage.go @@ -94,7 +94,7 @@ func (rs *RegistryStorage) Delete(id string) (<-chan interface{}, error) { } return apiserver.MakeAsync(func() (interface{}, error) { rs.deleteExternalLoadBalancer(service) - return api.Status{Status: api.StatusSuccess}, rs.registry.DeleteService(id) + return &api.Status{Status: api.StatusSuccess}, rs.registry.DeleteService(id) }), nil }