diff --git a/pkg/registry/apps/deployment/storage/storage.go b/pkg/registry/apps/deployment/storage/storage.go index 902419b62f2..a1ccfb5d78f 100644 --- a/pkg/registry/apps/deployment/storage/storage.go +++ b/pkg/registry/apps/deployment/storage/storage.go @@ -21,7 +21,6 @@ import ( "fmt" "net/http" - externalappsv1beta1 "k8s.io/api/apps/v1beta1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -149,7 +148,7 @@ func (r *RollbackREST) ProducesMIMETypes(verb string) []string { // ProducesObject returns an object the specified HTTP verb respond with. It will overwrite storage object if // it is not nil. Only the type of the return object matters, the value will be ignored. func (r *RollbackREST) ProducesObject(verb string) interface{} { - return externalappsv1beta1.DeploymentStatus{} + return metav1.Status{} } var _ = rest.StorageMetadata(&RollbackREST{}) diff --git a/pkg/registry/extensions/rest/storage_extensions.go b/pkg/registry/extensions/rest/storage_extensions.go index 0d7e7ebb299..2b21e502f07 100644 --- a/pkg/registry/extensions/rest/storage_extensions.go +++ b/pkg/registry/extensions/rest/storage_extensions.go @@ -47,17 +47,6 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag return apiGroupInfo, true } -type RollbackREST struct { - *deploymentstore.RollbackREST -} - -// override RollbackREST.ProducesObject -func (r *RollbackREST) ProducesObject(verb string) interface{} { - return extensionsapiv1beta1.DeploymentStatus{} -} - -var _ = rest.StorageMetadata(&RollbackREST{}) - func (p RESTStorageProvider) v1beta1Storage(apiResourceConfigSource serverstorage.APIResourceConfigSource, restOptionsGetter generic.RESTOptionsGetter) map[string]rest.Storage { storage := map[string]rest.Storage{} @@ -76,7 +65,7 @@ func (p RESTStorageProvider) v1beta1Storage(apiResourceConfigSource serverstorag deploymentStorage := deploymentstore.NewStorage(restOptionsGetter) storage["deployments"] = deploymentStorage.Deployment.WithCategories(nil) storage["deployments/status"] = deploymentStorage.Status - storage["deployments/rollback"] = &RollbackREST{deploymentStorage.Rollback} + storage["deployments/rollback"] = deploymentStorage.Rollback storage["deployments/scale"] = deploymentStorage.Scale // ingresses ingressStorage, ingressStatusStorage := ingressstore.NewREST(restOptionsGetter)