From f557ba1b09a8e8e0e42cd06ed952f8b1fbbca617 Mon Sep 17 00:00:00 2001 From: Di Xu Date: Thu, 10 Aug 2017 15:16:50 +0800 Subject: [PATCH 1/2] remvoe redundant words in Type Taint --- pkg/api/types.go | 4 ++-- staging/src/k8s.io/api/core/v1/types.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/api/types.go b/pkg/api/types.go index e6d637f0c82..1f29fbe8d45 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -2073,8 +2073,8 @@ type PreferredSchedulingTerm struct { Preference NodeSelectorTerm } -// The node this Taint is attached to has the effect "effect" on -// any pod that that does not tolerate the Taint. +// The node this Taint is attached to has the "effect" on +// any pod that does not tolerate the Taint. type Taint struct { // Required. The taint key to be applied to a node. Key string diff --git a/staging/src/k8s.io/api/core/v1/types.go b/staging/src/k8s.io/api/core/v1/types.go index 6b79e441e9d..75307b9b7e5 100644 --- a/staging/src/k8s.io/api/core/v1/types.go +++ b/staging/src/k8s.io/api/core/v1/types.go @@ -2291,8 +2291,8 @@ type PreferredSchedulingTerm struct { Preference NodeSelectorTerm `json:"preference" protobuf:"bytes,2,opt,name=preference"` } -// The node this Taint is attached to has the effect "effect" on -// any pod that that does not tolerate the Taint. +// The node this Taint is attached to has the "effect" on +// any pod that does not tolerate the Taint. type Taint struct { // Required. The taint key to be applied to a node. // +patchMergeKey=key From f873da91f3000de9d5265fbdb73f2573575a93ea Mon Sep 17 00:00:00 2001 From: Di Xu Date: Thu, 10 Aug 2017 15:36:52 +0800 Subject: [PATCH 2/2] auto-gen --- api/openapi-spec/swagger.json | 2 +- api/swagger-spec/v1.json | 2 +- docs/api-reference/v1/definitions.html | 2 +- staging/src/k8s.io/api/core/v1/generated.proto | 4 ++-- staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 9101e356c43..d9923310eb5 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -57060,7 +57060,7 @@ } }, "io.k8s.api.core.v1.Taint": { - "description": "The node this Taint is attached to has the effect \"effect\" on any pod that that does not tolerate the Taint.", + "description": "The node this Taint is attached to has the \"effect\" on any pod that does not tolerate the Taint.", "required": [ "key", "effect" diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index fa4d81f5575..111d7939342 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -18327,7 +18327,7 @@ }, "v1.Taint": { "id": "v1.Taint", - "description": "The node this Taint is attached to has the effect \"effect\" on any pod that that does not tolerate the Taint.", + "description": "The node this Taint is attached to has the \"effect\" on any pod that does not tolerate the Taint.", "required": [ "key", "effect" diff --git a/docs/api-reference/v1/definitions.html b/docs/api-reference/v1/definitions.html index 99906a231fc..44fcbf007ca 100755 --- a/docs/api-reference/v1/definitions.html +++ b/docs/api-reference/v1/definitions.html @@ -2143,7 +2143,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

v1.Taint

-

The node this Taint is attached to has the effect "effect" on any pod that that does not tolerate the Taint.

+

The node this Taint is attached to has the "effect" on any pod that does not tolerate the Taint.

diff --git a/staging/src/k8s.io/api/core/v1/generated.proto b/staging/src/k8s.io/api/core/v1/generated.proto index 60ec75b5f10..dce45c17797 100644 --- a/staging/src/k8s.io/api/core/v1/generated.proto +++ b/staging/src/k8s.io/api/core/v1/generated.proto @@ -3897,8 +3897,8 @@ message TCPSocketAction { optional string host = 2; } -// The node this Taint is attached to has the effect "effect" on -// any pod that that does not tolerate the Taint. +// The node this Taint is attached to has the "effect" on +// any pod that does not tolerate the Taint. message Taint { // Required. The taint key to be applied to a node. // +patchMergeKey=key diff --git a/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go index a702310fb45..6f5e54f8968 100644 --- a/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go @@ -1936,7 +1936,7 @@ func (TCPSocketAction) SwaggerDoc() map[string]string { } var map_Taint = map[string]string{ - "": "The node this Taint is attached to has the effect \"effect\" on any pod that that does not tolerate the Taint.", + "": "The node this Taint is attached to has the \"effect\" on any pod that does not tolerate the Taint.", "key": "Required. The taint key to be applied to a node.", "value": "Required. The taint value corresponding to the taint key.", "effect": "Required. The effect of the taint on pods that do not tolerate the taint. Valid effects are NoSchedule, PreferNoSchedule and NoExecute.",