mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-03 09:22:44 +00:00
update client-go
This commit is contained in:
parent
46b0da4320
commit
cc6bc17ab4
@ -1886,9 +1886,7 @@ type PodAffinityTerm struct {
|
|||||||
// +optional
|
// +optional
|
||||||
LabelSelector *metav1.LabelSelector
|
LabelSelector *metav1.LabelSelector
|
||||||
// namespaces specifies which namespaces the labelSelector applies to (matches against);
|
// namespaces specifies which namespaces the labelSelector applies to (matches against);
|
||||||
// nil list means "this pod's namespace," empty list means "all namespaces"
|
// null or empty list means "this pod's namespace"
|
||||||
// The json tag here is not "omitempty" since we need to distinguish nil and empty.
|
|
||||||
// See https://golang.org/pkg/encoding/json/#Marshal for more details.
|
|
||||||
Namespaces []string
|
Namespaces []string
|
||||||
// This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
|
// This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
|
||||||
// the labelSelector in the specified namespaces, where co-located is defined as running on a node
|
// the labelSelector in the specified namespaces, where co-located is defined as running on a node
|
||||||
|
@ -2278,9 +2278,7 @@ message PodAffinityTerm {
|
|||||||
optional k8s.io.apimachinery.pkg.apis.meta.v1.LabelSelector labelSelector = 1;
|
optional k8s.io.apimachinery.pkg.apis.meta.v1.LabelSelector labelSelector = 1;
|
||||||
|
|
||||||
// namespaces specifies which namespaces the labelSelector applies to (matches against);
|
// namespaces specifies which namespaces the labelSelector applies to (matches against);
|
||||||
// nil list means "this pod's namespace," empty list means "all namespaces"
|
// null or empty list means "this pod's namespace"
|
||||||
// The json tag here is not "omitempty" since we need to distinguish nil and empty.
|
|
||||||
// See https://golang.org/pkg/encoding/json/#Marshal for more details.
|
|
||||||
repeated string namespaces = 2;
|
repeated string namespaces = 2;
|
||||||
|
|
||||||
// This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
|
// This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
|
||||||
|
@ -32190,12 +32190,13 @@ func (x *PodAffinityTerm) CodecEncodeSelf(e *codec1978.Encoder) {
|
|||||||
_, _, _ = yysep2, yyq2, yy2arr2
|
_, _, _ = yysep2, yyq2, yy2arr2
|
||||||
const yyr2 bool = false
|
const yyr2 bool = false
|
||||||
yyq2[0] = x.LabelSelector != nil
|
yyq2[0] = x.LabelSelector != nil
|
||||||
|
yyq2[1] = len(x.Namespaces) != 0
|
||||||
yyq2[2] = x.TopologyKey != ""
|
yyq2[2] = x.TopologyKey != ""
|
||||||
var yynn2 int
|
var yynn2 int
|
||||||
if yyr2 || yy2arr2 {
|
if yyr2 || yy2arr2 {
|
||||||
r.EncodeArrayStart(3)
|
r.EncodeArrayStart(3)
|
||||||
} else {
|
} else {
|
||||||
yynn2 = 1
|
yynn2 = 0
|
||||||
for _, b := range yyq2 {
|
for _, b := range yyq2 {
|
||||||
if b {
|
if b {
|
||||||
yynn2++
|
yynn2++
|
||||||
@ -32241,28 +32242,34 @@ func (x *PodAffinityTerm) CodecEncodeSelf(e *codec1978.Encoder) {
|
|||||||
}
|
}
|
||||||
if yyr2 || yy2arr2 {
|
if yyr2 || yy2arr2 {
|
||||||
z.EncSendContainerState(codecSelfer_containerArrayElem1234)
|
z.EncSendContainerState(codecSelfer_containerArrayElem1234)
|
||||||
if x.Namespaces == nil {
|
if yyq2[1] {
|
||||||
r.EncodeNil()
|
if x.Namespaces == nil {
|
||||||
} else {
|
r.EncodeNil()
|
||||||
yym7 := z.EncBinary()
|
|
||||||
_ = yym7
|
|
||||||
if false {
|
|
||||||
} else {
|
} else {
|
||||||
z.F.EncSliceStringV(x.Namespaces, false, e)
|
yym7 := z.EncBinary()
|
||||||
|
_ = yym7
|
||||||
|
if false {
|
||||||
|
} else {
|
||||||
|
z.F.EncSliceStringV(x.Namespaces, false, e)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
r.EncodeNil()
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
z.EncSendContainerState(codecSelfer_containerMapKey1234)
|
if yyq2[1] {
|
||||||
r.EncodeString(codecSelferC_UTF81234, string("namespaces"))
|
z.EncSendContainerState(codecSelfer_containerMapKey1234)
|
||||||
z.EncSendContainerState(codecSelfer_containerMapValue1234)
|
r.EncodeString(codecSelferC_UTF81234, string("namespaces"))
|
||||||
if x.Namespaces == nil {
|
z.EncSendContainerState(codecSelfer_containerMapValue1234)
|
||||||
r.EncodeNil()
|
if x.Namespaces == nil {
|
||||||
} else {
|
r.EncodeNil()
|
||||||
yym8 := z.EncBinary()
|
|
||||||
_ = yym8
|
|
||||||
if false {
|
|
||||||
} else {
|
} else {
|
||||||
z.F.EncSliceStringV(x.Namespaces, false, e)
|
yym8 := z.EncBinary()
|
||||||
|
_ = yym8
|
||||||
|
if false {
|
||||||
|
} else {
|
||||||
|
z.F.EncSliceStringV(x.Namespaces, false, e)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2102,10 +2102,8 @@ type PodAffinityTerm struct {
|
|||||||
// +optional
|
// +optional
|
||||||
LabelSelector *metav1.LabelSelector `json:"labelSelector,omitempty" protobuf:"bytes,1,opt,name=labelSelector"`
|
LabelSelector *metav1.LabelSelector `json:"labelSelector,omitempty" protobuf:"bytes,1,opt,name=labelSelector"`
|
||||||
// namespaces specifies which namespaces the labelSelector applies to (matches against);
|
// namespaces specifies which namespaces the labelSelector applies to (matches against);
|
||||||
// nil list means "this pod's namespace," empty list means "all namespaces"
|
// null or empty list means "this pod's namespace"
|
||||||
// The json tag here is not "omitempty" since we need to distinguish nil and empty.
|
Namespaces []string `json:"namespaces,omitempty" protobuf:"bytes,2,rep,name=namespaces"`
|
||||||
// See https://golang.org/pkg/encoding/json/#Marshal for more details.
|
|
||||||
Namespaces []string `json:"namespaces" protobuf:"bytes,2,rep,name=namespaces"`
|
|
||||||
// This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
|
// This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
|
||||||
// the labelSelector in the specified namespaces, where co-located is defined as running on a node
|
// the labelSelector in the specified namespaces, where co-located is defined as running on a node
|
||||||
// whose value of the label with key topologyKey matches that of any node on which any of the
|
// whose value of the label with key topologyKey matches that of any node on which any of the
|
||||||
|
@ -1189,7 +1189,7 @@ func (PodAffinity) SwaggerDoc() map[string]string {
|
|||||||
var map_PodAffinityTerm = map[string]string{
|
var map_PodAffinityTerm = map[string]string{
|
||||||
"": "Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key <topologyKey> tches that of any node on which a pod of the set of pods is running",
|
"": "Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key <topologyKey> tches that of any node on which a pod of the set of pods is running",
|
||||||
"labelSelector": "A label query over a set of resources, in this case pods.",
|
"labelSelector": "A label query over a set of resources, in this case pods.",
|
||||||
"namespaces": "namespaces specifies which namespaces the labelSelector applies to (matches against); nil list means \"this pod's namespace,\" empty list means \"all namespaces\" The json tag here is not \"omitempty\" since we need to distinguish nil and empty. See https://golang.org/pkg/encoding/json/#Marshal for more details.",
|
"namespaces": "namespaces specifies which namespaces the labelSelector applies to (matches against); null or empty list means \"this pod's namespace\"",
|
||||||
"topologyKey": "This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. For PreferredDuringScheduling pod anti-affinity, empty topologyKey is interpreted as \"all topologies\" (\"all topologies\" here means all the topologyKeys indicated by scheduler command-line argument --failure-domains); for affinity and for RequiredDuringScheduling pod anti-affinity, empty topologyKey is not allowed.",
|
"topologyKey": "This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. For PreferredDuringScheduling pod anti-affinity, empty topologyKey is interpreted as \"all topologies\" (\"all topologies\" here means all the topologyKeys indicated by scheduler command-line argument --failure-domains); for affinity and for RequiredDuringScheduling pod anti-affinity, empty topologyKey is not allowed.",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user