mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-17 15:13:08 +00:00
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.
This commit is contained in:
@@ -57884,9 +57884,7 @@
|
||||
"properties": {
|
||||
"key": {
|
||||
"description": "The label key that the selector applies to.",
|
||||
"type": "string",
|
||||
"x-kubernetes-patch-merge-key": "key",
|
||||
"x-kubernetes-patch-strategy": "merge"
|
||||
"type": "string"
|
||||
},
|
||||
"operator": {
|
||||
"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 @@
|
||||
},
|
||||
"key": {
|
||||
"description": "Required. The taint key to be applied to a node.",
|
||||
"type": "string",
|
||||
"x-kubernetes-patch-merge-key": "key",
|
||||
"x-kubernetes-patch-strategy": "merge"
|
||||
"type": "string"
|
||||
},
|
||||
"timeAdded": {
|
||||
"description": "TimeAdded represents the time at which the taint was added. It is only written for NoExecute taints.",
|
||||
@@ -60024,9 +60020,7 @@
|
||||
},
|
||||
"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.",
|
||||
"type": "string",
|
||||
"x-kubernetes-patch-merge-key": "key",
|
||||
"x-kubernetes-patch-strategy": "merge"
|
||||
"type": "string"
|
||||
},
|
||||
"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.",
|
||||
|
Reference in New Issue
Block a user