Merge pull request kubernetes#31194 from mml/evict.followup

Automatic merge from submit-queue Fix followups from kubernetes#31033
penland365 · Sep 5, 2016 · 6bcc4e9 · 6bcc4e9
2 parents 09e5fa6 + 1589945
commit 6bcc4e9
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json
@@ -18930,7 +18930,7 @@
    },
    "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": {
      "kind": {
       "type": "string",

diff --git a/docs/api-reference/v1/definitions.html b/docs/api-reference/v1/definitions.html
@@ -6745,7 +6745,7 @@ <h3 id="_v1_securitycontext">v1.SecurityContext</h3>
 <div class="sect2">
 <h3 id="_v1alpha1_eviction">v1alpha1.Eviction</h3>
 <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>
 <table class="tableblock frame-all grid-all" style="width:100%; ">
 <colgroup>
@@ -8434,7 +8434,7 @@ <h3 id="_any">any</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2016-08-23 16:31:19 UTC
+Last updated 2016-08-30 23:23:55 UTC
 </div>
 </div>
 </body>

diff --git a/pkg/apis/policy/types.go b/pkg/apis/policy/types.go
@@ -72,7 +72,7 @@ type PodDisruptionBudgetList struct {
 
 // 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.
+// created by POSTing to .../pods/<pod name>/evictions.
 type Eviction struct {
 	unversioned.TypeMeta `json:",inline"`
 

diff --git a/pkg/apis/policy/v1alpha1/generated.proto b/pkg/apis/policy/v1alpha1/generated.proto
diff --git a/pkg/apis/policy/v1alpha1/types.go b/pkg/apis/policy/v1alpha1/types.go
@@ -71,7 +71,7 @@ type PodDisruptionBudgetList struct {
 
 // 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.
+// created by POSTing to .../pods/<pod name>/evictions.
 type Eviction struct {
 	unversioned.TypeMeta `json:",inline"`
 

diff --git a/pkg/apis/policy/v1alpha1/types_swagger_doc_generated.go b/pkg/apis/policy/v1alpha1/types_swagger_doc_generated.go
@@ -28,7 +28,7 @@ package v1alpha1
 
 // AUTO-GENERATED FUNCTIONS START HERE
 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.",
 	"deleteOptions": "DeleteOptions may be provided",
 }

diff --git a/pkg/registry/pod/etcd/etcd.go b/pkg/registry/pod/etcd/etcd.go
@@ -160,7 +160,7 @@ func (r *EvictionREST) Create(ctx api.Context, obj runtime.Object) (runtime.Obje
 		// Try to verify-and-decrement
 
 		// 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)
 		if err != nil {
 			return nil, err