diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
index e97a509560..79426189e2 100644
--- a/api/openapi-spec/swagger.json
+++ b/api/openapi-spec/swagger.json
@@ -29807,19 +29807,19 @@
"200": {
"description": "OK",
"schema": {
- "$ref": "#/definitions/io.k8s.api.apps.v1beta1.DeploymentStatus"
+ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
}
},
"201": {
"description": "Created",
"schema": {
- "$ref": "#/definitions/io.k8s.api.apps.v1beta1.DeploymentStatus"
+ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
}
},
"202": {
"description": "Accepted",
"schema": {
- "$ref": "#/definitions/io.k8s.api.apps.v1beta1.DeploymentStatus"
+ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
}
},
"401": {
@@ -50615,19 +50615,19 @@
"200": {
"description": "OK",
"schema": {
- "$ref": "#/definitions/io.k8s.api.extensions.v1beta1.DeploymentStatus"
+ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
}
},
"201": {
"description": "Created",
"schema": {
- "$ref": "#/definitions/io.k8s.api.extensions.v1beta1.DeploymentStatus"
+ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
}
},
"202": {
"description": "Accepted",
"schema": {
- "$ref": "#/definitions/io.k8s.api.extensions.v1beta1.DeploymentStatus"
+ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Status"
}
},
"401": {
diff --git a/api/swagger-spec/apps_v1beta1.json b/api/swagger-spec/apps_v1beta1.json
index 7c20518d1c..649573a5c8 100644
--- a/api/swagger-spec/apps_v1beta1.json
+++ b/api/swagger-spec/apps_v1beta1.json
@@ -1983,7 +1983,7 @@
"description": "API at /apis/apps/v1beta1",
"operations": [
{
- "type": "v1beta1.DeploymentStatus",
+ "type": "v1.Status",
"method": "POST",
"summary": "create rollback of a Deployment",
"nickname": "createNamespacedDeploymentRollback",
@@ -2025,17 +2025,17 @@
{
"code": 200,
"message": "OK",
- "responseModel": "v1beta1.DeploymentStatus"
+ "responseModel": "v1.Status"
},
{
"code": 201,
"message": "Created",
- "responseModel": "v1beta1.DeploymentStatus"
+ "responseModel": "v1.Status"
},
{
"code": 202,
"message": "Accepted",
- "responseModel": "v1beta1.DeploymentStatus"
+ "responseModel": "v1.Status"
}
],
"produces": [
diff --git a/api/swagger-spec/extensions_v1beta1.json b/api/swagger-spec/extensions_v1beta1.json
index 5ff5ce0ee9..f88198088d 100644
--- a/api/swagger-spec/extensions_v1beta1.json
+++ b/api/swagger-spec/extensions_v1beta1.json
@@ -2153,7 +2153,7 @@
"description": "API at /apis/extensions/v1beta1",
"operations": [
{
- "type": "v1beta1.DeploymentStatus",
+ "type": "v1.Status",
"method": "POST",
"summary": "create rollback of a Deployment",
"nickname": "createNamespacedDeploymentRollback",
@@ -2195,17 +2195,17 @@
{
"code": 200,
"message": "OK",
- "responseModel": "v1beta1.DeploymentStatus"
+ "responseModel": "v1.Status"
},
{
"code": 201,
"message": "Created",
- "responseModel": "v1beta1.DeploymentStatus"
+ "responseModel": "v1.Status"
},
{
"code": 202,
"message": "Accepted",
- "responseModel": "v1beta1.DeploymentStatus"
+ "responseModel": "v1.Status"
}
],
"produces": [
diff --git a/docs/api-reference/apps/v1beta1/operations.html b/docs/api-reference/apps/v1beta1/operations.html
index af86f9065e..719d041c43 100755
--- a/docs/api-reference/apps/v1beta1/operations.html
+++ b/docs/api-reference/apps/v1beta1/operations.html
@@ -2982,17 +2982,17 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
202 |
Accepted |
-v1beta1.DeploymentStatus |
+v1.Status |
200 |
success |
-v1beta1.DeploymentStatus |
+v1.Status |
201 |
Created |
-v1beta1.DeploymentStatus |
+v1.Status |
diff --git a/docs/api-reference/extensions/v1beta1/operations.html b/docs/api-reference/extensions/v1beta1/operations.html
index 06dd839dd5..b880ff52a7 100755
--- a/docs/api-reference/extensions/v1beta1/operations.html
+++ b/docs/api-reference/extensions/v1beta1/operations.html
@@ -3541,17 +3541,17 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
202 |
Accepted |
-v1beta1.DeploymentStatus |
+v1.Status |
200 |
success |
-v1beta1.DeploymentStatus |
+v1.Status |
201 |
Created |
-v1beta1.DeploymentStatus |
+v1.Status |
diff --git a/pkg/registry/apps/deployment/storage/BUILD b/pkg/registry/apps/deployment/storage/BUILD
index a61386978d..bc9b896959 100644
--- a/pkg/registry/apps/deployment/storage/BUILD
+++ b/pkg/registry/apps/deployment/storage/BUILD
@@ -49,7 +49,6 @@ go_library(
"//pkg/printers/internalversion:go_default_library",
"//pkg/printers/storage:go_default_library",
"//pkg/registry/apps/deployment:go_default_library",
- "//staging/src/k8s.io/api/apps/v1beta1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
diff --git a/pkg/registry/apps/deployment/storage/storage.go b/pkg/registry/apps/deployment/storage/storage.go
index 902419b62f..a1ccfb5d78 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 0d7e7ebb29..2b21e502f0 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)