Skip to content

K
k3s
Unverified Commit 78e1c6fe authored by Diego Pontoriero's avatar Diego Pontoriero
Browse files
Options

Remove incorrect patch-merge directives.

Directives were misplaced for the following types: - MatchExpressions - Taints - Tolerations Per the discussion in #46547, we cannot fix these because it would cause backwards-compatibility problems. Instead, remove the incorrect ones so they don't mislead users. This has no impact on behavior.
parent 6bc0b295
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 30 deletions
api/openapi-spec/swagger.json
View file @ 78e1c6fe
...@@ -57884,9 +57884,7 @@ ...@@ -57884,9 +57884,7 @@
"properties": { "properties": {
"key": { "key": {
"description": "The label key that the selector applies to.", "description": "The label key that the selector applies to.",
"type": "string", "type": "string"
"x-kubernetes-patch-merge-key": "key",
"x-kubernetes-patch-strategy": "merge"
}, },
"operator": { "operator": {
"description": "Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.", "description": "Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.",
...@@ -60001,9 +59999,7 @@ ...@@ -60001,9 +59999,7 @@
}, },
"key": { "key": {
"description": "Required. The taint key to be applied to a node.", "description": "Required. The taint key to be applied to a node.",
"type": "string", "type": "string"
"x-kubernetes-patch-merge-key": "key",
"x-kubernetes-patch-strategy": "merge"
}, },
"timeAdded": { "timeAdded": {
"description": "TimeAdded represents the time at which the taint was added. It is only written for NoExecute taints.", "description": "TimeAdded represents the time at which the taint was added. It is only written for NoExecute taints.",
...@@ -60024,9 +60020,7 @@ ...@@ -60024,9 +60020,7 @@
}, },
"key": { "key": {
"description": "Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys.", "description": "Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys.",
"type": "string", "type": "string"
"x-kubernetes-patch-merge-key": "key",
"x-kubernetes-patch-strategy": "merge"
}, },
"operator": { "operator": {
"description": "Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category.", "description": "Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category.",
federation/apis/openapi-spec/swagger.json
View file @ 78e1c6fe
...@@ -10881,9 +10881,7 @@ ...@@ -10881,9 +10881,7 @@
"properties": { "properties": {
"key": { "key": {
"description": "The label key that the selector applies to.", "description": "The label key that the selector applies to.",
"type": "string", "type": "string"
"x-kubernetes-patch-merge-key": "key",
"x-kubernetes-patch-strategy": "merge"
}, },
"operator": { "operator": {
"description": "Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.", "description": "Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.",
...@@ -11933,9 +11931,7 @@ ...@@ -11933,9 +11931,7 @@
}, },
"key": { "key": {
"description": "Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys.", "description": "Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys.",
"type": "string", "type": "string"
"x-kubernetes-patch-merge-key": "key",
"x-kubernetes-patch-strategy": "merge"
}, },
"operator": { "operator": {
"description": "Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category.", "description": "Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category.",
......
staging/src/k8s.io/api/core/v1/generated.proto
View file @ 78e1c6fe
...@@ -1655,8 +1655,6 @@ message NodeSelector { ...@@ -1655,8 +1655,6 @@ message NodeSelector {
// that relates the key and values. // that relates the key and values.
message NodeSelectorRequirement { message NodeSelectorRequirement {
// The label key that the selector applies to. // The label key that the selector applies to.
// +patchMergeKey=key
// +patchStrategy=merge
optional string key = 1; optional string key = 1;
// Represents a key's relationship to a set of values. // Represents a key's relationship to a set of values.
...@@ -3888,8 +3886,6 @@ message TCPSocketAction { ...@@ -3888,8 +3886,6 @@ message TCPSocketAction {
// any pod that does not tolerate the Taint. // any pod that does not tolerate the Taint.
message Taint { message Taint {
// Required. The taint key to be applied to a node. // Required. The taint key to be applied to a node.
// +patchMergeKey=key
// +patchStrategy=merge
optional string key = 1; optional string key = 1;
// Required. The taint value corresponding to the taint key. // Required. The taint value corresponding to the taint key.
...@@ -3913,8 +3909,6 @@ message Toleration { ...@@ -3913,8 +3909,6 @@ message Toleration {
// Key is the taint key that the toleration applies to. Empty means match all taint keys. // Key is the taint key that the toleration applies to. Empty means match all taint keys.
// If the key is empty, operator must be Exists; this combination means to match all values and all keys. // If the key is empty, operator must be Exists; this combination means to match all values and all keys.
// +optional // +optional
// +patchMergeKey=key
// +patchStrategy=merge
optional string key = 1; optional string key = 1;
// Operator represents a key's relationship to the value. // Operator represents a key's relationship to the value.
......
staging/src/k8s.io/api/core/v1/types.go
View file @ 78e1c6fe
...@@ -2114,9 +2114,7 @@ type NodeSelectorTerm struct { ...@@ -2114,9 +2114,7 @@ type NodeSelectorTerm struct {
// that relates the key and values. // that relates the key and values.
type NodeSelectorRequirement struct { type NodeSelectorRequirement struct {
// The label key that the selector applies to. // The label key that the selector applies to.
// +patchMergeKey=key Key string `json:"key" protobuf:"bytes,1,opt,name=key"`
// +patchStrategy=merge
Key string `json:"key" patchStrategy:"merge" patchMergeKey:"key" protobuf:"bytes,1,opt,name=key"`
// Represents a key's relationship to a set of values. // Represents a key's relationship to a set of values.
// Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt. // Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
Operator NodeSelectorOperator `json:"operator" protobuf:"bytes,2,opt,name=operator,casttype=NodeSelectorOperator"` Operator NodeSelectorOperator `json:"operator" protobuf:"bytes,2,opt,name=operator,casttype=NodeSelectorOperator"`
...@@ -2302,9 +2300,7 @@ type PreferredSchedulingTerm struct { ...@@ -2302,9 +2300,7 @@ type PreferredSchedulingTerm struct {
// any pod that does not tolerate the Taint. // any pod that does not tolerate the Taint.
type Taint struct { type Taint struct {
// Required. The taint key to be applied to a node. // Required. The taint key to be applied to a node.
// +patchMergeKey=key Key string `json:"key" protobuf:"bytes,1,opt,name=key"`
// +patchStrategy=merge
Key string `json:"key" patchStrategy:"merge" patchMergeKey:"key" protobuf:"bytes,1,opt,name=key"`
// Required. The taint value corresponding to the taint key. // Required. The taint value corresponding to the taint key.
// +optional // +optional
Value string `json:"value,omitempty" protobuf:"bytes,2,opt,name=value"` Value string `json:"value,omitempty" protobuf:"bytes,2,opt,name=value"`
...@@ -2346,9 +2342,7 @@ type Toleration struct { ...@@ -2346,9 +2342,7 @@ type Toleration struct {
// Key is the taint key that the toleration applies to. Empty means match all taint keys. // Key is the taint key that the toleration applies to. Empty means match all taint keys.
// If the key is empty, operator must be Exists; this combination means to match all values and all keys. // If the key is empty, operator must be Exists; this combination means to match all values and all keys.
// +optional // +optional
// +patchMergeKey=key Key string `json:"key,omitempty" protobuf:"bytes,1,opt,name=key"`
// +patchStrategy=merge
Key string `json:"key,omitempty" patchStrategy:"merge" patchMergeKey:"key" protobuf:"bytes,1,opt,name=key"`
// Operator represents a key's relationship to the value. // Operator represents a key's relationship to the value.
// Valid operators are Exists and Equal. Defaults to Equal. // Valid operators are Exists and Equal. Defaults to Equal.
// Exists is equivalent to wildcard for value, so that a pod can // Exists is equivalent to wildcard for value, so that a pod can
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment