github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33148 from mml/words

Browse Source 
Automatic merge from submit-queue

Clarify MinAvailable approval semantics.
This commit is contained in:
Kubernetes Submit Queue 2016-10-10 20:32:45 -07:00 committed by GitHub
commit 28080293b1
9 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/openapi-spec/root_swagger.json
View File

@ -29065,7 +29065,7 @@
"description": "PodDisruptionBudgetSpec is a description of a PodDisruptionBudget.",
"properties": {
"minAvailable": {
"description": "The minimum number of pods that must be available simultaneously. This can be either an integer or a string specifying a percentage, e.g. \"28%\".",
"description": "An eviction is allowed if at least \"minAvailable\" pods selected by \"selector\" will still be available after the eviction, i.e. even in the absence of the evicted pod. So for example you can prevent all voluntary evictions by specifying \"100%\".",
"$ref": "#/definitions/intstr.IntOrString"
},
"selector": {

2
api/openapi-spec/v1alpha1.policy.json
View File

@ -1166,7 +1166,7 @@
"description": "PodDisruptionBudgetSpec is a description of a PodDisruptionBudget.",
"properties": {
"minAvailable": {
"description": "The minimum number of pods that must be available simultaneously. This can be either an integer or a string specifying a percentage, e.g. \"28%\".",
"description": "An eviction is allowed if at least \"minAvailable\" pods selected by \"selector\" will still be available after the eviction, i.e. even in the absence of the evicted pod. So for example you can prevent all voluntary evictions by specifying \"100%\".",
"$ref": "#/definitions/intstr.IntOrString"
},
"selector": {

2
api/swagger-spec/policy_v1alpha1.json
View File

@ -1159,7 +1159,7 @@
"properties": {
"minAvailable": {
"type": "string",
"description": "The minimum number of pods that must be available simultaneously. This can be either an integer or a string specifying a percentage, e.g. \"28%\"."
"description": "An eviction is allowed if at least \"minAvailable\" pods selected by \"selector\" will still be available after the eviction, i.e. even in the absence of the evicted pod. So for example you can prevent all voluntary evictions by specifying \"100%\"."
},
"selector": {
"$ref": "unversioned.LabelSelector",

4
docs/api-reference/policy/v1alpha1/definitions.html
View File

@ -1243,7 +1243,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
<tbody>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">minAvailable</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">The minimum number of pods that must be available simultaneously. This can be either an integer or a string specifying a percentage, e.g. "28%".</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">An eviction is allowed if at least "minAvailable" pods selected by "selector" will still be available after the eviction, i.e. even in the absence of the evicted pod. So for example you can prevent all voluntary evictions by specifying "100%".</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">string</p></td>
<td class="tableblock halign-left valign-top"></td>
@ -1388,7 +1388,7 @@ Examples:<br>
</div>
<div id="footer">
<div id="footer-text">
Last updated 2016-09-28 00:00:25 UTC
Last updated 2016-10-10 18:01:55 UTC
</div>
</div>
</body>

6
pkg/apis/policy/types.go
View File

@ -24,8 +24,10 @@ import (
// PodDisruptionBudgetSpec is a description of a PodDisruptionBudget.
type PodDisruptionBudgetSpec struct {
// The minimum number of pods that must be available simultaneously. This
// can be either an integer or a string specifying a percentage, e.g. "28%".
// An eviction is allowed if at least "minAvailable" pods selected by
// "selector" will still be available after the eviction, i.e. even in the
// absence of the evicted pod. So for example you can prevent all voluntary
// evictions by specifying "100%".
MinAvailable intstr.IntOrString `json:"minAvailable,omitempty"`
// Label query over pods whose evictions are managed by the disruption

6
pkg/apis/policy/v1alpha1/generated.proto
View File

@ -61,8 +61,10 @@ message PodDisruptionBudgetList {
// PodDisruptionBudgetSpec is a description of a PodDisruptionBudget.
message PodDisruptionBudgetSpec {
// The minimum number of pods that must be available simultaneously. This
// can be either an integer or a string specifying a percentage, e.g. "28%".
// An eviction is allowed if at least "minAvailable" pods selected by
// "selector" will still be available after the eviction, i.e. even in the
// absence of the evicted pod. So for example you can prevent all voluntary
// evictions by specifying "100%".
optional k8s.io.kubernetes.pkg.util.intstr.IntOrString minAvailable = 1;
// Label query over pods whose evictions are managed by the disruption

6
pkg/apis/policy/v1alpha1/types.go
View File

@ -24,8 +24,10 @@ import (
// PodDisruptionBudgetSpec is a description of a PodDisruptionBudget.
type PodDisruptionBudgetSpec struct {
// The minimum number of pods that must be available simultaneously. This
// can be either an integer or a string specifying a percentage, e.g. "28%".
// An eviction is allowed if at least "minAvailable" pods selected by
// "selector" will still be available after the eviction, i.e. even in the
// absence of the evicted pod. So for example you can prevent all voluntary
// evictions by specifying "100%".
MinAvailable intstr.IntOrString `json:"minAvailable,omitempty" protobuf:"bytes,1,opt,name=minAvailable"`
// Label query over pods whose evictions are managed by the disruption

2
pkg/apis/policy/v1alpha1/types_swagger_doc_generated.go
View File

@ -57,7 +57,7 @@ func (PodDisruptionBudgetList) SwaggerDoc() map[string]string {
var map_PodDisruptionBudgetSpec = map[string]string{
"": "PodDisruptionBudgetSpec is a description of a PodDisruptionBudget.",
"minAvailable": "The minimum number of pods that must be available simultaneously. This can be either an integer or a string specifying a percentage, e.g. \"28%\".",
"minAvailable": "An eviction is allowed if at least \"minAvailable\" pods selected by \"selector\" will still be available after the eviction, i.e. even in the absence of the evicted pod. So for example you can prevent all voluntary evictions by specifying \"100%\".",
"selector": "Label query over pods whose evictions are managed by the disruption budget.",
}

4
pkg/generated/openapi/zz_generated.openapi.go
View File

@ -4871,7 +4871,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{
Properties: map[string]spec.Schema{
"minAvailable": {
SchemaProps: spec.SchemaProps{
Description: "The minimum number of pods that must be available simultaneously. This can be either an integer or a string specifying a percentage, e.g. \"28%\".",
Description: "An eviction is allowed if at least \"minAvailable\" pods selected by \"selector\" will still be available after the eviction, i.e. even in the absence of the evicted pod. So for example you can prevent all voluntary evictions by specifying \"100%\".",
Ref: spec.MustCreateRef("#/definitions/intstr.IntOrString"),
},
},
@ -14579,7 +14579,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{
Properties: map[string]spec.Schema{
"minAvailable": {
SchemaProps: spec.SchemaProps{
Description: "The minimum number of pods that must be available simultaneously. This can be either an integer or a string specifying a percentage, e.g. \"28%\".",
Description: "An eviction is allowed if at least \"minAvailable\" pods selected by \"selector\" will still be available after the eviction, i.e. even in the absence of the evicted pod. So for example you can prevent all voluntary evictions by specifying \"100%\".",
Ref: spec.MustCreateRef("#/definitions/intstr.IntOrString"),
},
},