scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 03:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31194 from mml/evict.followup

Browse Source 
Automatic merge from submit-queue

Fix followups from #31033
This commit is contained in:
Kubernetes Submit Queue
2016-09-05 13:38:30 -07:00
committed by GitHub
parent 09e5fa62b5 15899451a5
commit 6bcc4e9f2a
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18930,7 +18930,7 @@
}, },
"v1alpha1.Eviction": { "v1alpha1.Eviction": {
"id": "v1alpha1.Eviction", "id": "v1alpha1.Eviction",
"description": "Eviction evicts a pod from its node subject to certain policies and safety constraints. This is a subresource of Pod. A request to cause such an eviction is created by POSTing to .../pods/foo/evictions.", "description": "Eviction evicts a pod from its node subject to certain policies and safety constraints. This is a subresource of Pod. A request to cause such an eviction is created by POSTing to .../pods/\u003cpod name\u003e/evictions.",
"properties": { "properties": {
"kind": { "kind": {
"type": "string", "type": "string",

4
docs/api-reference/v1/definitions.html
View File

@@ -6745,7 +6745,7 @@ The resulting set of endpoints can be viewed as:<br>
<div class="sect2"> <div class="sect2">
<h3 id="_v1alpha1_eviction">v1alpha1.Eviction</h3> <h3 id="_v1alpha1_eviction">v1alpha1.Eviction</h3>
<div class="paragraph"> <div class="paragraph">
<p>Eviction evicts a pod from its node subject to certain policies and safety constraints. This is a subresource of Pod. A request to cause such an eviction is created by POSTing to &#8230;/pods/foo/evictions.</p> <p>Eviction evicts a pod from its node subject to certain policies and safety constraints. This is a subresource of Pod. A request to cause such an eviction is created by POSTing to &#8230;/pods/&lt;pod name&gt;/evictions.</p>
</div> </div>
<table class="tableblock frame-all grid-all" style="width:100%; "> <table class="tableblock frame-all grid-all" style="width:100%; ">
<colgroup> <colgroup>
@@ -8434,7 +8434,7 @@ The resulting set of endpoints can be viewed as:<br>
</div> </div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2016-08-23 16:31:19 UTC Last updated 2016-08-30 23:23:55 UTC
</div> </div>
</div> </div>
</body> </body>

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

@@ -72,7 +72,7 @@ type PodDisruptionBudgetList struct {
// Eviction evicts a pod from its node subject to certain policies and safety constraints. // Eviction evicts a pod from its node subject to certain policies and safety constraints.
// This is a subresource of Pod. A request to cause such an eviction is // This is a subresource of Pod. A request to cause such an eviction is
// created by POSTing to .../pods/foo/evictions. // created by POSTing to .../pods/<pod name>/evictions.
type Eviction struct { type Eviction struct {
unversioned.TypeMeta `json:",inline"` unversioned.TypeMeta `json:",inline"`

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

@@ -32,7 +32,7 @@ option go_package = "v1alpha1";
// Eviction evicts a pod from its node subject to certain policies and safety constraints. // Eviction evicts a pod from its node subject to certain policies and safety constraints.
// This is a subresource of Pod. A request to cause such an eviction is // This is a subresource of Pod. A request to cause such an eviction is
// created by POSTing to .../pods/foo/evictions. // created by POSTing to .../pods/<pod name>/evictions.
message Eviction { message Eviction {
// ObjectMeta describes the pod that is being evicted. // ObjectMeta describes the pod that is being evicted.
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;

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

@@ -71,7 +71,7 @@ type PodDisruptionBudgetList struct {
// Eviction evicts a pod from its node subject to certain policies and safety constraints. // Eviction evicts a pod from its node subject to certain policies and safety constraints.
// This is a subresource of Pod. A request to cause such an eviction is // This is a subresource of Pod. A request to cause such an eviction is
// created by POSTing to .../pods/foo/evictions. // created by POSTing to .../pods/<pod name>/evictions.
type Eviction struct { type Eviction struct {
unversioned.TypeMeta `json:",inline"` unversioned.TypeMeta `json:",inline"`

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

@@ -28,7 +28,7 @@ package v1alpha1
// AUTO-GENERATED FUNCTIONS START HERE // AUTO-GENERATED FUNCTIONS START HERE
var map_Eviction = map[string]string{ var map_Eviction = map[string]string{
"": "Eviction evicts a pod from its node subject to certain policies and safety constraints. This is a subresource of Pod. A request to cause such an eviction is created by POSTing to .../pods/foo/evictions.", "": "Eviction evicts a pod from its node subject to certain policies and safety constraints. This is a subresource of Pod. A request to cause such an eviction is created by POSTing to .../pods/<pod name>/evictions.",
"metadata": "ObjectMeta describes the pod that is being evicted.", "metadata": "ObjectMeta describes the pod that is being evicted.",
"deleteOptions": "DeleteOptions may be provided", "deleteOptions": "DeleteOptions may be provided",
} }

2
pkg/registry/pod/etcd/etcd.go
View File

@@ -160,7 +160,7 @@ func (r *EvictionREST) Create(ctx api.Context, obj runtime.Object) (runtime.Obje
// Try to verify-and-decrement // Try to verify-and-decrement
// If it was false already, or if it becomes false during the course of our retries, // If it was false already, or if it becomes false during the course of our retries,
// raise an error marked as a ... 429 maybe? // raise an error marked as a 429.
ok, err := r.checkAndDecrement(ctx, pdb) ok, err := r.checkAndDecrement(ctx, pdb)
if err != nil { if err != nil {
return nil, err return nil, err