github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #88584 from willise/master

Browse Source 
fix: remove conflict comment of taint "Value"
This commit is contained in:
Kubernetes Prow Robot 2020-03-02 20:03:37 -08:00 committed by GitHub
commit 53d63e11a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/openapi-spec/swagger.json generated
View File

@ -10099,7 +10099,7 @@
"description": "TimeAdded represents the time at which the taint was added. It is only written for NoExecute taints."
},
"value": {
"description": "Required. The taint value corresponding to the taint key.",
"description": "The taint value corresponding to the taint key.",
"type": "string"
}
},

2
staging/src/k8s.io/api/core/v1/generated.proto
View File

@ -4912,7 +4912,7 @@ message Taint {
// Required. The taint key to be applied to a node.
optional string key = 1;
// Required. The taint value corresponding to the taint key.
// The taint value corresponding to the taint key.
// +optional
optional string value = 2;

2
staging/src/k8s.io/api/core/v1/types.go
View File

@ -2751,7 +2751,7 @@ type PreferredSchedulingTerm struct {
type Taint struct {
// Required. The taint key to be applied to a node.
Key string `json:"key" protobuf:"bytes,1,opt,name=key"`
// Required. The taint value corresponding to the taint key.
// The taint value corresponding to the taint key.
// +optional
Value string `json:"value,omitempty" protobuf:"bytes,2,opt,name=value"`
// Required. The effect of the taint on pods

2
staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go generated
View File

@ -2282,7 +2282,7 @@ func (TCPSocketAction) SwaggerDoc() map[string]string {
var map_Taint = map[string]string{
"": "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.",
"value": "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.",
"timeAdded": "TimeAdded represents the time at which the taint was added. It is only written for NoExecute taints.",
}