mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-26 05:03:09 +00:00
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 ```
This commit is contained in:
commit
8c1f45953b
@ -50670,7 +50670,7 @@
|
|||||||
"io.k8s.kubernetes.pkg.apis.apps.v1beta1.RollbackConfig": {
|
"io.k8s.kubernetes.pkg.apis.apps.v1beta1.RollbackConfig": {
|
||||||
"properties": {
|
"properties": {
|
||||||
"revision": {
|
"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",
|
"type": "integer",
|
||||||
"format": "int64"
|
"format": "int64"
|
||||||
}
|
}
|
||||||
@ -53555,7 +53555,7 @@
|
|||||||
"io.k8s.kubernetes.pkg.apis.extensions.v1beta1.RollbackConfig": {
|
"io.k8s.kubernetes.pkg.apis.extensions.v1beta1.RollbackConfig": {
|
||||||
"properties": {
|
"properties": {
|
||||||
"revision": {
|
"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",
|
"type": "integer",
|
||||||
"format": "int64"
|
"format": "int64"
|
||||||
}
|
}
|
||||||
|
@ -5650,7 +5650,7 @@
|
|||||||
"revision": {
|
"revision": {
|
||||||
"type": "integer",
|
"type": "integer",
|
||||||
"format": "int64",
|
"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."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -9364,7 +9364,7 @@
|
|||||||
"revision": {
|
"revision": {
|
||||||
"type": "integer",
|
"type": "integer",
|
||||||
"format": "int64",
|
"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."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -2428,7 +2428,7 @@ When an object is created, the system will populate this list with the current s
|
|||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="tableblock halign-left valign-top"><p class="tableblock">revision</p></td>
|
<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">false</p></td>
|
||||||
<td class="tableblock halign-left valign-top"><p class="tableblock">integer (int64)</p></td>
|
<td class="tableblock halign-left valign-top"><p class="tableblock">integer (int64)</p></td>
|
||||||
<td class="tableblock halign-left valign-top"></td>
|
<td class="tableblock halign-left valign-top"></td>
|
||||||
|
@ -3007,7 +3007,7 @@ When an object is created, the system will populate this list with the current s
|
|||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="tableblock halign-left valign-top"><p class="tableblock">revision</p></td>
|
<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">false</p></td>
|
||||||
<td class="tableblock halign-left valign-top"><p class="tableblock">integer (int64)</p></td>
|
<td class="tableblock halign-left valign-top"><p class="tableblock">integer (int64)</p></td>
|
||||||
<td class="tableblock halign-left valign-top"></td>
|
<td class="tableblock halign-left valign-top"></td>
|
||||||
|
@ -13627,7 +13627,7 @@
|
|||||||
"io.k8s.kubernetes.pkg.apis.extensions.v1beta1.RollbackConfig": {
|
"io.k8s.kubernetes.pkg.apis.extensions.v1beta1.RollbackConfig": {
|
||||||
"properties": {
|
"properties": {
|
||||||
"revision": {
|
"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",
|
"type": "integer",
|
||||||
"format": "int64"
|
"format": "int64"
|
||||||
}
|
}
|
||||||
|
@ -7108,7 +7108,7 @@
|
|||||||
"revision": {
|
"revision": {
|
||||||
"type": "integer",
|
"type": "integer",
|
||||||
"format": "int64",
|
"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."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -2756,7 +2756,7 @@ When an object is created, the system will populate this list with the current s
|
|||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="tableblock halign-left valign-top"><p class="tableblock">revision</p></td>
|
<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">false</p></td>
|
||||||
<td class="tableblock halign-left valign-top"><p class="tableblock">integer (int64)</p></td>
|
<td class="tableblock halign-left valign-top"><p class="tableblock">integer (int64)</p></td>
|
||||||
<td class="tableblock halign-left valign-top"></td>
|
<td class="tableblock halign-left valign-top"></td>
|
||||||
|
@ -225,7 +225,7 @@ message DeploymentStrategy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
message RollbackConfig {
|
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
|
||||||
optional int64 revision = 1;
|
optional int64 revision = 1;
|
||||||
}
|
}
|
||||||
|
@ -260,7 +260,7 @@ type DeploymentRollback struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type RollbackConfig 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
|
// +optional
|
||||||
Revision int64 `json:"revision,omitempty" protobuf:"varint,1,opt,name=revision"`
|
Revision int64 `json:"revision,omitempty" protobuf:"varint,1,opt,name=revision"`
|
||||||
}
|
}
|
||||||
|
@ -138,7 +138,7 @@ func (DeploymentStrategy) SwaggerDoc() map[string]string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var map_RollbackConfig = 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 {
|
func (RollbackConfig) SwaggerDoc() map[string]string {
|
||||||
|
@ -235,7 +235,7 @@ type DeploymentRollback struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type RollbackConfig 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
|
// +optional
|
||||||
Revision int64
|
Revision int64
|
||||||
}
|
}
|
||||||
|
@ -835,7 +835,7 @@ message ReplicationControllerDummy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
message RollbackConfig {
|
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
|
||||||
optional int64 revision = 1;
|
optional int64 revision = 1;
|
||||||
}
|
}
|
||||||
|
@ -228,7 +228,7 @@ type DeploymentRollback struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type RollbackConfig 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
|
// +optional
|
||||||
Revision int64 `json:"revision,omitempty" protobuf:"varint,1,opt,name=revision"`
|
Revision int64 `json:"revision,omitempty" protobuf:"varint,1,opt,name=revision"`
|
||||||
}
|
}
|
||||||
|
@ -499,7 +499,7 @@ func (ReplicationControllerDummy) SwaggerDoc() map[string]string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var map_RollbackConfig = 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 {
|
func (RollbackConfig) SwaggerDoc() map[string]string {
|
||||||
|
@ -225,7 +225,7 @@ message DeploymentStrategy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
message RollbackConfig {
|
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
|
||||||
optional int64 revision = 1;
|
optional int64 revision = 1;
|
||||||
}
|
}
|
||||||
|
@ -260,7 +260,7 @@ type DeploymentRollback struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type RollbackConfig 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
|
// +optional
|
||||||
Revision int64 `json:"revision,omitempty" protobuf:"varint,1,opt,name=revision"`
|
Revision int64 `json:"revision,omitempty" protobuf:"varint,1,opt,name=revision"`
|
||||||
}
|
}
|
||||||
|
@ -138,7 +138,7 @@ func (DeploymentStrategy) SwaggerDoc() map[string]string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var map_RollbackConfig = 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 {
|
func (RollbackConfig) SwaggerDoc() map[string]string {
|
||||||
|
@ -235,7 +235,7 @@ type DeploymentRollback struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type RollbackConfig 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
|
// +optional
|
||||||
Revision int64
|
Revision int64
|
||||||
}
|
}
|
||||||
|
@ -835,7 +835,7 @@ message ReplicationControllerDummy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
message RollbackConfig {
|
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
|
||||||
optional int64 revision = 1;
|
optional int64 revision = 1;
|
||||||
}
|
}
|
||||||
|
@ -228,7 +228,7 @@ type DeploymentRollback struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type RollbackConfig 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
|
// +optional
|
||||||
Revision int64 `json:"revision,omitempty" protobuf:"varint,1,opt,name=revision"`
|
Revision int64 `json:"revision,omitempty" protobuf:"varint,1,opt,name=revision"`
|
||||||
}
|
}
|
||||||
|
@ -499,7 +499,7 @@ func (ReplicationControllerDummy) SwaggerDoc() map[string]string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var map_RollbackConfig = 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 {
|
func (RollbackConfig) SwaggerDoc() map[string]string {
|
||||||
|
Loading…
Reference in New Issue
Block a user