github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #972 from brendandburns/pod

Browse Source 
Switch api.Status to *api.Status in a bunch of places.
This commit is contained in:
Clayton Coleman 2014-08-20 16:53:36 -04:00
commit 6b05d71d74
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apiserver/operation.go
View File

@ -190,7 +190,7 @@ func (op *Operation) StatusOrResult() (description interface{}, finished bool) {
defer op.lock.Unlock() defer op.lock.Unlock()
if op.finished == nil { if op.finished == nil {
return api.Status{ return &api.Status{
Status: api.StatusWorking, Status: api.StatusWorking,
Reason: api.ReasonTypeWorking, Reason: api.ReasonTypeWorking,
Details: &api.StatusDetails{ID: op.ID, Kind: "operation"}, Details: &api.StatusDetails{ID: op.ID, Kind: "operation"},

2
pkg/registry/controller/storage.go
View File

@ -77,7 +77,7 @@ func (rs *RegistryStorage) Create(obj interface{}) (<-chan interface{}, error) {
// Delete asynchronously deletes the ReplicationController specified by its id. // Delete asynchronously deletes the ReplicationController specified by its id.
func (rs *RegistryStorage) Delete(id string) (<-chan interface{}, error) { func (rs *RegistryStorage) Delete(id string) (<-chan interface{}, error) {
return apiserver.MakeAsync(func() (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 }), nil
} }

2
pkg/registry/pod/storage.go
View File

@ -91,7 +91,7 @@ func (rs *RegistryStorage) Create(obj interface{}) (<-chan interface{}, error) {
func (rs *RegistryStorage) Delete(id string) (<-chan interface{}, error) { func (rs *RegistryStorage) Delete(id string) (<-chan interface{}, error) {
return apiserver.MakeAsync(func() (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 }), nil
} }

2
pkg/registry/service/storage.go
View File

@ -94,7 +94,7 @@ func (rs *RegistryStorage) Delete(id string) (<-chan interface{}, error) {
} }
return apiserver.MakeAsync(func() (interface{}, error) { return apiserver.MakeAsync(func() (interface{}, error) {
rs.deleteExternalLoadBalancer(service) rs.deleteExternalLoadBalancer(service)
return api.Status{Status: api.StatusSuccess}, rs.registry.DeleteService(id) return &api.Status{Status: api.StatusSuccess}, rs.registry.DeleteService(id)
}), nil }), nil
} }