Skip to content

Commit 53d63e1

Browse files
authored
Merge pull request kubernetes#88584 from willise/master
fix: remove conflict comment of taint "Value"
2 parents 79e1ad2 + cb477d3 commit 53d63e1

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

api/openapi-spec/swagger.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/api/core/v1/generated.proto

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/api/core/v1/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2751,7 +2751,7 @@ type PreferredSchedulingTerm struct {
27512751
type Taint struct {
27522752
// Required. The taint key to be applied to a node.
27532753
Key string `json:"key" protobuf:"bytes,1,opt,name=key"`
2754-
// Required. The taint value corresponding to the taint key.
2754+
// The taint value corresponding to the taint key.
27552755
// +optional
27562756
Value string `json:"value,omitempty" protobuf:"bytes,2,opt,name=value"`
27572757
// Required. The effect of the taint on pods

staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)