Merge pull request #46431 from zjj2wry/rollback-rollback

Automatic merge from submit-queue (batch tested with PRs 42240, 46100, 46154, 46431, 45755) Fix api description in swagger **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note 　NONE ```

Merge pull request #46431 from zjj2wry/rollback-rollback
8c1f4595 · Kubernetes Submit Queue · GitHub · e9b92c80 · 60c3152c · 8c1f4595
Commit 8c1f4595 authored May 30, 2017 by Kubernetes Submit Queue Committed by GitHub May 30, 2017
22 changed files
--- a/api/openapi-spec/swagger.json
+++ b/api/openapi-spec/swagger.json
@@ -50670,7 +50670,7 @@
   "io.k8s.kubernetes.pkg.apis.apps.v1beta1.RollbackConfig": {
    "properties": {
     "revision": {
-      "description": "The revision to rollback to. If set to 0, rollbck to the last revision.",
+      "description": "The revision to rollback to. If set to 0, rollback to the last revision.",
      "type": "integer",
      "format": "int64"
     }
@@ -53555,7 +53555,7 @@
   "io.k8s.kubernetes.pkg.apis.extensions.v1beta1.RollbackConfig": {
    "properties": {
     "revision": {
-      "description": "The revision to rollback to. If set to 0, rollbck to the last revision.",
+      "description": "The revision to rollback to. If set to 0, rollback to the last revision.",
      "type": "integer",
      "format": "int64"
     }
--- a/api/swagger-spec/apps_v1beta1.json
+++ b/api/swagger-spec/apps_v1beta1.json
@@ -5650,7 +5650,7 @@
     "revision": {
      "type": "integer",
      "format": "int64",
-      "description": "The revision to rollback to. If set to 0, rollbck to the last revision."
+      "description": "The revision to rollback to. If set to 0, rollback to the last revision."
     }
    }
   },

--- a/api/swagger-spec/extensions_v1beta1.json
+++ b/api/swagger-spec/extensions_v1beta1.json
@@ -9364,7 +9364,7 @@
     "revision": {
      "type": "integer",
      "format": "int64",
-      "description": "The revision to rollback to. If set to 0, rollbck to the last revision."
+      "description": "The revision to rollback to. If set to 0, rollback to the last revision."
     }
    }
   },

--- a/docs/api-reference/apps/v1beta1/definitions.html
+++ b/docs/api-reference/apps/v1beta1/definitions.html
@@ -2428,7 +2428,7 @@ When an object is created, the system will populate this list with the current s
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">revision</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">The revision to rollback to. If set to 0, rollbck to the last revision.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The revision to rollback to. If set to 0, rollback to the last revision.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">integer (int64)</p></td>
 <td class="tableblock halign-left valign-top"></td>

--- a/docs/api-reference/extensions/v1beta1/definitions.html
+++ b/docs/api-reference/extensions/v1beta1/definitions.html
@@ -3007,7 +3007,7 @@ When an object is created, the system will populate this list with the current s
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">revision</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">The revision to rollback to. If set to 0, rollbck to the last revision.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The revision to rollback to. If set to 0, rollback to the last revision.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">integer (int64)</p></td>
 <td class="tableblock halign-left valign-top"></td>

--- a/federation/apis/openapi-spec/swagger.json
+++ b/federation/apis/openapi-spec/swagger.json
@@ -13627,7 +13627,7 @@
   "io.k8s.kubernetes.pkg.apis.extensions.v1beta1.RollbackConfig": {
    "properties": {
     "revision": {
-      "description": "The revision to rollback to. If set to 0, rollbck to the last revision.",
+      "description": "The revision to rollback to. If set to 0, rollback to the last revision.",
      "type": "integer",
      "format": "int64"
     }

--- a/federation/apis/swagger-spec/extensions_v1beta1.json
+++ b/federation/apis/swagger-spec/extensions_v1beta1.json
@@ -7108,7 +7108,7 @@
     "revision": {
      "type": "integer",
      "format": "int64",
-      "description": "The revision to rollback to. If set to 0, rollbck to the last revision."
+      "description": "The revision to rollback to. If set to 0, rollback to the last revision."
     }
    }
   },

--- a/federation/docs/api-reference/extensions/v1beta1/definitions.html
+++ b/federation/docs/api-reference/extensions/v1beta1/definitions.html
@@ -2756,7 +2756,7 @@ When an object is created, the system will populate this list with the current s
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">revision</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">The revision to rollback to. If set to 0, rollbck to the last revision.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The revision to rollback to. If set to 0, rollback to the last revision.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">integer (int64)</p></td>
 <td class="tableblock halign-left valign-top"></td>

--- a/pkg/apis/apps/v1beta1/generated.proto
+++ b/pkg/apis/apps/v1beta1/generated.proto
@@ -225,7 +225,7 @@ message DeploymentStrategy {
 }
 message RollbackConfig {
-  // The revision to rollback to. If set to 0, rollbck to the last revision.
+  // The revision to rollback to. If set to 0, rollback to the last revision.
  // +optional
  optional int64 revision = 1;
 }

--- a/pkg/apis/apps/v1beta1/types.go
+++ b/pkg/apis/apps/v1beta1/types.go
@@ -260,7 +260,7 @@ type DeploymentRollback struct {
 }
 type RollbackConfig struct {
-	// The revision to rollback to. If set to 0, rollbck to the last revision.
+	// The revision to rollback to. If set to 0, rollback to the last revision.
 	// +optional
 	Revision int64 `json:"revision,omitempty" protobuf:"varint,1,opt,name=revision"`
 }

--- a/pkg/apis/apps/v1beta1/types_swagger_doc_generated.go
+++ b/pkg/apis/apps/v1beta1/types_swagger_doc_generated.go
@@ -138,7 +138,7 @@ func (DeploymentStrategy) SwaggerDoc() map[string]string {
 }
 var map_RollbackConfig = map[string]string{
-	"revision": "The revision to rollback to. If set to 0, rollbck to the last revision.",
+	"revision": "The revision to rollback to. If set to 0, rollback to the last revision.",
 }
 func (RollbackConfig) SwaggerDoc() map[string]string {

--- a/pkg/apis/extensions/types.go
+++ b/pkg/apis/extensions/types.go
@@ -235,7 +235,7 @@ type DeploymentRollback struct {
 }
 type RollbackConfig struct {
-	// The revision to rollback to. If set to 0, rollbck to the last revision.
+	// The revision to rollback to. If set to 0, rollback to the last revision.
 	// +optional
 	Revision int64
 }

--- a/pkg/apis/extensions/v1beta1/generated.proto
+++ b/pkg/apis/extensions/v1beta1/generated.proto
@@ -835,7 +835,7 @@ message ReplicationControllerDummy {
 }
 message RollbackConfig {
-  // The revision to rollback to. If set to 0, rollbck to the last revision.
+  // The revision to rollback to. If set to 0, rollback to the last revision.
  // +optional
  optional int64 revision = 1;
 }

--- a/pkg/apis/extensions/v1beta1/types.go
+++ b/pkg/apis/extensions/v1beta1/types.go
@@ -228,7 +228,7 @@ type DeploymentRollback struct {
 }
 type RollbackConfig struct {
-	// The revision to rollback to. If set to 0, rollbck to the last revision.
+	// The revision to rollback to. If set to 0, rollback to the last revision.
 	// +optional
 	Revision int64 `json:"revision,omitempty" protobuf:"varint,1,opt,name=revision"`
 }

--- a/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go
+++ b/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go
@@ -499,7 +499,7 @@ func (ReplicationControllerDummy) SwaggerDoc() map[string]string {
 }
 var map_RollbackConfig = map[string]string{
-	"revision": "The revision to rollback to. If set to 0, rollbck to the last revision.",
+	"revision": "The revision to rollback to. If set to 0, rollback to the last revision.",
 }
 func (RollbackConfig) SwaggerDoc() map[string]string {

--- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.proto
+++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.proto
@@ -225,7 +225,7 @@ message DeploymentStrategy {
 }
 message RollbackConfig {
-  // The revision to rollback to. If set to 0, rollbck to the last revision.
+  // The revision to rollback to. If set to 0, rollback to the last revision.
  // +optional
  optional int64 revision = 1;
 }

--- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/types.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/types.go
@@ -260,7 +260,7 @@ type DeploymentRollback struct {
 }
 type RollbackConfig struct {
-	// The revision to rollback to. If set to 0, rollbck to the last revision.
+	// The revision to rollback to. If set to 0, rollback to the last revision.
 	// +optional
 	Revision int64 `json:"revision,omitempty" protobuf:"varint,1,opt,name=revision"`
 }

--- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/types_swagger_doc_generated.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/types_swagger_doc_generated.go
@@ -138,7 +138,7 @@ func (DeploymentStrategy) SwaggerDoc() map[string]string {
 }
 var map_RollbackConfig = map[string]string{
-	"revision": "The revision to rollback to. If set to 0, rollbck to the last revision.",
+	"revision": "The revision to rollback to. If set to 0, rollback to the last revision.",
 }
 func (RollbackConfig) SwaggerDoc() map[string]string {

--- a/staging/src/k8s.io/client-go/pkg/apis/extensions/types.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/types.go
@@ -235,7 +235,7 @@ type DeploymentRollback struct {
 }
 type RollbackConfig struct {
-	// The revision to rollback to. If set to 0, rollbck to the last revision.
+	// The revision to rollback to. If set to 0, rollback to the last revision.
 	// +optional
 	Revision int64
 }

--- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.proto
+++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.proto
@@ -835,7 +835,7 @@ message ReplicationControllerDummy {
 }
 message RollbackConfig {
-  // The revision to rollback to. If set to 0, rollbck to the last revision.
+  // The revision to rollback to. If set to 0, rollback to the last revision.
  // +optional
  optional int64 revision = 1;
 }

--- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types.go
@@ -228,7 +228,7 @@ type DeploymentRollback struct {
 }
 type RollbackConfig struct {
-	// The revision to rollback to. If set to 0, rollbck to the last revision.
+	// The revision to rollback to. If set to 0, rollback to the last revision.
 	// +optional
 	Revision int64 `json:"revision,omitempty" protobuf:"varint,1,opt,name=revision"`
 }

--- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go
@@ -499,7 +499,7 @@ func (ReplicationControllerDummy) SwaggerDoc() map[string]string {
 }
 var map_RollbackConfig = map[string]string{
-	"revision": "The revision to rollback to. If set to 0, rollbck to the last revision.",
+	"revision": "The revision to rollback to. If set to 0, rollback to the last revision.",
 }
 func (RollbackConfig) SwaggerDoc() map[string]string {