From 956f74c3830eab167e433d3630e51a1321c5618c Mon Sep 17 00:00:00 2001 From: Matt Liggett Date: Mon, 22 Aug 2016 17:19:49 -0700 Subject: [PATCH 1/2] Fix followups from #31033 --- pkg/apis/policy/types.go | 2 +- pkg/apis/policy/v1alpha1/types.go | 2 +- pkg/registry/pod/etcd/etcd.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/apis/policy/types.go b/pkg/apis/policy/types.go index d7c7e86151c..a79732a5d60 100644 --- 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//evictions. type Eviction struct { unversioned.TypeMeta `json:",inline"` diff --git a/pkg/apis/policy/v1alpha1/types.go b/pkg/apis/policy/v1alpha1/types.go index 21b920cbc95..ced015d3d6e 100644 --- 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//evictions. type Eviction struct { unversioned.TypeMeta `json:",inline"` diff --git a/pkg/registry/pod/etcd/etcd.go b/pkg/registry/pod/etcd/etcd.go index 65203a3e19f..dc4fa3e37c1 100644 --- 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 From 15899451a5eebe2b79b2b6f51644079d11e1977d Mon Sep 17 00:00:00 2001 From: Matt Liggett Date: Tue, 30 Aug 2016 16:25:04 -0700 Subject: [PATCH 2/2] // update-all --- api/swagger-spec/v1.json | 2 +- docs/api-reference/v1/definitions.html | 4 ++-- pkg/apis/policy/v1alpha1/generated.proto | 2 +- pkg/apis/policy/v1alpha1/types_swagger_doc_generated.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index 4bec62fe9a2..45b9711c01b 100644 --- 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 index f34c87bdf49..f3d21e41a9b 100755 --- a/docs/api-reference/v1/definitions.html +++ b/docs/api-reference/v1/definitions.html @@ -6745,7 +6745,7 @@ The resulting set of endpoints can be viewed as:

v1alpha1.Eviction

-

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.

@@ -8434,7 +8434,7 @@ The resulting set of endpoints can be viewed as:
diff --git a/pkg/apis/policy/v1alpha1/generated.proto b/pkg/apis/policy/v1alpha1/generated.proto index 2bc3b524b8b..8fb5c2be63f 100644 --- a/pkg/apis/policy/v1alpha1/generated.proto +++ b/pkg/apis/policy/v1alpha1/generated.proto @@ -32,7 +32,7 @@ option go_package = "v1alpha1"; // 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//evictions. message Eviction { // ObjectMeta describes the pod that is being evicted. optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; diff --git a/pkg/apis/policy/v1alpha1/types_swagger_doc_generated.go b/pkg/apis/policy/v1alpha1/types_swagger_doc_generated.go index 4711780e339..7750b1007fe 100644 --- 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//evictions.", "metadata": "ObjectMeta describes the pod that is being evicted.", "deleteOptions": "DeleteOptions may be provided", }