mirror of
https://github.com/kubernetes/sample-controller.git
synced 2026-05-01 00:00:03 +08:00
Merge pull request #63059 from ceshihao/upgrade_json_package_fix_base64_newline
Automatic merge from submit-queue (batch tested with PRs 59965, 59115, 63076, 63059). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Upgrade dep json-iterator/go to fix base64 decode bug **What this PR does / why we need it**: upgrade dep `json-iterator/go` to fix base64 decode bug #62742 **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #62742 **Special notes for your reviewer**: Just upgrade `json-iterator/go` to latest which includes base64 decode fix https://github.com/json-iterator/go/pull/266 No other code changes **Release note**: ```release-note None ``` Kubernetes-commit: 3dbcd1ddcee786f443f89a82514bbd9c6ad06c99
This commit is contained in:
+815
-763
File diff suppressed because it is too large
Load Diff
+8
-2
@@ -1877,10 +1877,16 @@ message NodeSelectorRequirement {
|
||||
repeated string values = 3;
|
||||
}
|
||||
|
||||
// A null or empty node selector term matches no objects.
|
||||
// A null or empty node selector term matches no objects. The requirements of
|
||||
// them are ANDed.
|
||||
message NodeSelectorTerm {
|
||||
// Required. A list of node selector requirements. The requirements are ANDed.
|
||||
// A list of node selector requirements by node's labels.
|
||||
// +optional
|
||||
repeated NodeSelectorRequirement matchExpressions = 1;
|
||||
|
||||
// A list of node selector requirements by node's fields.
|
||||
// +optional
|
||||
repeated NodeSelectorRequirement matchFields = 2;
|
||||
}
|
||||
|
||||
// NodeSpec describes the attributes that a node is created with.
|
||||
|
||||
+8
-3
@@ -2322,10 +2322,15 @@ type NodeSelector struct {
|
||||
NodeSelectorTerms []NodeSelectorTerm `json:"nodeSelectorTerms" protobuf:"bytes,1,rep,name=nodeSelectorTerms"`
|
||||
}
|
||||
|
||||
// A null or empty node selector term matches no objects.
|
||||
// A null or empty node selector term matches no objects. The requirements of
|
||||
// them are ANDed.
|
||||
type NodeSelectorTerm struct {
|
||||
//Required. A list of node selector requirements. The requirements are ANDed.
|
||||
MatchExpressions []NodeSelectorRequirement `json:"matchExpressions" protobuf:"bytes,1,rep,name=matchExpressions"`
|
||||
// A list of node selector requirements by node's labels.
|
||||
// +optional
|
||||
MatchExpressions []NodeSelectorRequirement `json:"matchExpressions,omitempty" protobuf:"bytes,1,rep,name=matchExpressions"`
|
||||
// A list of node selector requirements by node's fields.
|
||||
// +optional
|
||||
MatchFields []NodeSelectorRequirement `json:"matchFields,omitempty" protobuf:"bytes,2,rep,name=matchFields"`
|
||||
}
|
||||
|
||||
// A node selector requirement is a selector that contains values, a key, and an operator
|
||||
|
||||
+3
-2
@@ -1034,8 +1034,9 @@ func (NodeSelectorRequirement) SwaggerDoc() map[string]string {
|
||||
}
|
||||
|
||||
var map_NodeSelectorTerm = map[string]string{
|
||||
"": "A null or empty node selector term matches no objects.",
|
||||
"matchExpressions": "Required. A list of node selector requirements. The requirements are ANDed.",
|
||||
"": "A null or empty node selector term matches no objects. The requirements of them are ANDed.",
|
||||
"matchExpressions": "A list of node selector requirements by node's labels.",
|
||||
"matchFields": "A list of node selector requirements by node's fields.",
|
||||
}
|
||||
|
||||
func (NodeSelectorTerm) SwaggerDoc() map[string]string {
|
||||
|
||||
+7
@@ -2543,6 +2543,13 @@ func (in *NodeSelectorTerm) DeepCopyInto(out *NodeSelectorTerm) {
|
||||
(*in)[i].DeepCopyInto(&(*out)[i])
|
||||
}
|
||||
}
|
||||
if in.MatchFields != nil {
|
||||
in, out := &in.MatchFields, &out.MatchFields
|
||||
*out = make([]NodeSelectorRequirement, len(*in))
|
||||
for i := range *in {
|
||||
(*in)[i].DeepCopyInto(&(*out)[i])
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user