Commit d72b32b9 authored by Kevin's avatar Kevin

update generated files

parent 72a19819
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -3477,18 +3477,24 @@ message Taint { ...@@ -3477,18 +3477,24 @@ message Taint {
// Required. The effect of the taint on pods // Required. The effect of the taint on pods
// that do not tolerate the taint. // that do not tolerate the taint.
// Valid effects are NoSchedule and PreferNoSchedule. // Valid effects are NoSchedule, PreferNoSchedule and NoExecute.
optional string effect = 3; optional string effect = 3;
// TimeAdded represents the time at which the taint was added.
// It is only written for NoExecute taints.
// +optional
optional k8s.io.apimachinery.pkg.apis.meta.v1.Time timeAdded = 4;
} }
// The pod this Toleration is attached to tolerates any taint that matches // The pod this Toleration is attached to tolerates any taint that matches
// the triple <key,value,effect> using the matching operator <operator>. // the triple <key,value,effect> using the matching operator <operator>.
message Toleration { message Toleration {
// Required. Key is the taint key that the toleration applies to. // 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.
// +optional // +optional
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.
// 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
// tolerate all taints of a particular category. // tolerate all taints of a particular category.
...@@ -3501,9 +3507,16 @@ message Toleration { ...@@ -3501,9 +3507,16 @@ message Toleration {
optional string value = 3; optional string value = 3;
// Effect indicates the taint effect to match. Empty means match all taint effects. // Effect indicates the taint effect to match. Empty means match all taint effects.
// When specified, allowed values are NoSchedule and PreferNoSchedule. // When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
// +optional // +optional
optional string effect = 4; optional string effect = 4;
// TolerationSeconds represents the period of time the toleration (which must be
// of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default,
// it is not set, which means tolerate the taint forever (do not evict). Zero and
// negative values will be treated as 0 (evict immediately) by the system.
// +optional
optional int64 tolerationSeconds = 5;
} }
// Volume represents a named volume in a pod that may be accessed by any container in the pod. // Volume represents a named volume in a pod that may be accessed by any container in the pod.
......
...@@ -1767,10 +1767,11 @@ func (TCPSocketAction) SwaggerDoc() map[string]string { ...@@ -1767,10 +1767,11 @@ func (TCPSocketAction) SwaggerDoc() map[string]string {
} }
var map_Taint = map[string]string{ var map_Taint = map[string]string{
"": "The node this Taint is attached to has the effect \"effect\" on any pod that that does not tolerate the Taint.", "": "The node this Taint is attached to has the effect \"effect\" on any pod that that does not tolerate the Taint.",
"key": "Required. The taint key to be applied to a node.", "key": "Required. The taint key to be applied to a node.",
"value": "Required. The taint value corresponding to the taint key.", "value": "Required. The taint value corresponding to the taint key.",
"effect": "Required. The effect of the taint on pods that do not tolerate the taint. Valid effects are NoSchedule and PreferNoSchedule.", "effect": "Required. The effect of the taint on pods that do not tolerate the taint. Valid effects are NoSchedule, PreferNoSchedule and NoExecute.",
"timeAdded": "TimeAdded represents the time at which the taint was added. It is only written for NoExecute taints.",
} }
func (Taint) SwaggerDoc() map[string]string { func (Taint) SwaggerDoc() map[string]string {
...@@ -1778,11 +1779,12 @@ func (Taint) SwaggerDoc() map[string]string { ...@@ -1778,11 +1779,12 @@ func (Taint) SwaggerDoc() map[string]string {
} }
var map_Toleration = map[string]string{ var map_Toleration = map[string]string{
"": "The pod this Toleration is attached to tolerates any taint that matches the triple <key,value,effect> using the matching operator <operator>.", "": "The pod this Toleration is attached to tolerates any taint that matches the triple <key,value,effect> using the matching operator <operator>.",
"key": "Required. Key is the taint key that the toleration applies to.", "key": "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.",
"operator": "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.", "operator": "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.",
"value": "Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string.", "value": "Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string.",
"effect": "Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule and PreferNoSchedule.", "effect": "Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.",
"tolerationSeconds": "TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system.",
} }
func (Toleration) SwaggerDoc() map[string]string { func (Toleration) SwaggerDoc() map[string]string {
......
...@@ -4203,6 +4203,7 @@ func autoConvert_v1_Taint_To_api_Taint(in *Taint, out *api.Taint, s conversion.S ...@@ -4203,6 +4203,7 @@ func autoConvert_v1_Taint_To_api_Taint(in *Taint, out *api.Taint, s conversion.S
out.Key = in.Key out.Key = in.Key
out.Value = in.Value out.Value = in.Value
out.Effect = api.TaintEffect(in.Effect) out.Effect = api.TaintEffect(in.Effect)
out.TimeAdded = in.TimeAdded
return nil return nil
} }
...@@ -4214,6 +4215,7 @@ func autoConvert_api_Taint_To_v1_Taint(in *api.Taint, out *Taint, s conversion.S ...@@ -4214,6 +4215,7 @@ func autoConvert_api_Taint_To_v1_Taint(in *api.Taint, out *Taint, s conversion.S
out.Key = in.Key out.Key = in.Key
out.Value = in.Value out.Value = in.Value
out.Effect = TaintEffect(in.Effect) out.Effect = TaintEffect(in.Effect)
out.TimeAdded = in.TimeAdded
return nil return nil
} }
...@@ -4226,6 +4228,7 @@ func autoConvert_v1_Toleration_To_api_Toleration(in *Toleration, out *api.Tolera ...@@ -4226,6 +4228,7 @@ func autoConvert_v1_Toleration_To_api_Toleration(in *Toleration, out *api.Tolera
out.Operator = api.TolerationOperator(in.Operator) out.Operator = api.TolerationOperator(in.Operator)
out.Value = in.Value out.Value = in.Value
out.Effect = api.TaintEffect(in.Effect) out.Effect = api.TaintEffect(in.Effect)
out.TolerationSeconds = (*int64)(unsafe.Pointer(in.TolerationSeconds))
return nil return nil
} }
...@@ -4238,6 +4241,7 @@ func autoConvert_api_Toleration_To_v1_Toleration(in *api.Toleration, out *Tolera ...@@ -4238,6 +4241,7 @@ func autoConvert_api_Toleration_To_v1_Toleration(in *api.Toleration, out *Tolera
out.Operator = TolerationOperator(in.Operator) out.Operator = TolerationOperator(in.Operator)
out.Value = in.Value out.Value = in.Value
out.Effect = TaintEffect(in.Effect) out.Effect = TaintEffect(in.Effect)
out.TolerationSeconds = (*int64)(unsafe.Pointer(in.TolerationSeconds))
return nil return nil
} }
......
...@@ -3070,6 +3070,7 @@ func DeepCopy_v1_Taint(in interface{}, out interface{}, c *conversion.Cloner) er ...@@ -3070,6 +3070,7 @@ func DeepCopy_v1_Taint(in interface{}, out interface{}, c *conversion.Cloner) er
in := in.(*Taint) in := in.(*Taint)
out := out.(*Taint) out := out.(*Taint)
*out = *in *out = *in
out.TimeAdded = in.TimeAdded.DeepCopy()
return nil return nil
} }
} }
...@@ -3079,6 +3080,11 @@ func DeepCopy_v1_Toleration(in interface{}, out interface{}, c *conversion.Clone ...@@ -3079,6 +3080,11 @@ func DeepCopy_v1_Toleration(in interface{}, out interface{}, c *conversion.Clone
in := in.(*Toleration) in := in.(*Toleration)
out := out.(*Toleration) out := out.(*Toleration)
*out = *in *out = *in
if in.TolerationSeconds != nil {
in, out := &in.TolerationSeconds, &out.TolerationSeconds
*out = new(int64)
**out = **in
}
return nil return nil
} }
} }
......
...@@ -3097,6 +3097,7 @@ func DeepCopy_api_Taint(in interface{}, out interface{}, c *conversion.Cloner) e ...@@ -3097,6 +3097,7 @@ func DeepCopy_api_Taint(in interface{}, out interface{}, c *conversion.Cloner) e
in := in.(*Taint) in := in.(*Taint)
out := out.(*Taint) out := out.(*Taint)
*out = *in *out = *in
out.TimeAdded = in.TimeAdded.DeepCopy()
return nil return nil
} }
} }
...@@ -3106,6 +3107,11 @@ func DeepCopy_api_Toleration(in interface{}, out interface{}, c *conversion.Clon ...@@ -3106,6 +3107,11 @@ func DeepCopy_api_Toleration(in interface{}, out interface{}, c *conversion.Clon
in := in.(*Toleration) in := in.(*Toleration)
out := out.(*Toleration) out := out.(*Toleration)
*out = *in *out = *in
if in.TolerationSeconds != nil {
in, out := &in.TolerationSeconds, &out.TolerationSeconds
*out = new(int64)
**out = **in
}
return nil return nil
} }
} }
......
...@@ -257,7 +257,11 @@ func DeepCopy_v1alpha1_KubeletConfiguration(in interface{}, out interface{}, c * ...@@ -257,7 +257,11 @@ func DeepCopy_v1alpha1_KubeletConfiguration(in interface{}, out interface{}, c *
if in.RegisterWithTaints != nil { if in.RegisterWithTaints != nil {
in, out := &in.RegisterWithTaints, &out.RegisterWithTaints in, out := &in.RegisterWithTaints, &out.RegisterWithTaints
*out = make([]v1.Taint, len(*in)) *out = make([]v1.Taint, len(*in))
copy(*out, *in) for i := range *in {
if err := v1.DeepCopy_v1_Taint(&(*in)[i], &(*out)[i], c); err != nil {
return err
}
}
} }
if in.KubeAPIQPS != nil { if in.KubeAPIQPS != nil {
in, out := &in.KubeAPIQPS, &out.KubeAPIQPS in, out := &in.KubeAPIQPS, &out.KubeAPIQPS
......
...@@ -197,7 +197,11 @@ func DeepCopy_componentconfig_KubeletConfiguration(in interface{}, out interface ...@@ -197,7 +197,11 @@ func DeepCopy_componentconfig_KubeletConfiguration(in interface{}, out interface
if in.RegisterWithTaints != nil { if in.RegisterWithTaints != nil {
in, out := &in.RegisterWithTaints, &out.RegisterWithTaints in, out := &in.RegisterWithTaints, &out.RegisterWithTaints
*out = make([]api.Taint, len(*in)) *out = make([]api.Taint, len(*in))
copy(*out, *in) for i := range *in {
if err := api.DeepCopy_api_Taint(&(*in)[i], &(*out)[i], c); err != nil {
return err
}
}
} }
if in.NodeLabels != nil { if in.NodeLabels != nil {
in, out := &in.NodeLabels, &out.NodeLabels in, out := &in.NodeLabels, &out.NodeLabels
......
...@@ -8300,16 +8300,23 @@ var OpenAPIDefinitions *openapi.OpenAPIDefinitions = &openapi.OpenAPIDefinitions ...@@ -8300,16 +8300,23 @@ var OpenAPIDefinitions *openapi.OpenAPIDefinitions = &openapi.OpenAPIDefinitions
}, },
"effect": { "effect": {
SchemaProps: spec.SchemaProps{ SchemaProps: spec.SchemaProps{
Description: "Required. The effect of the taint on pods that do not tolerate the taint. Valid effects are NoSchedule and PreferNoSchedule.", Description: "Required. The effect of the taint on pods that do not tolerate the taint. Valid effects are NoSchedule, PreferNoSchedule and NoExecute.",
Type: []string{"string"}, Type: []string{"string"},
Format: "", Format: "",
}, },
}, },
"timeAdded": {
SchemaProps: spec.SchemaProps{
Description: "TimeAdded represents the time at which the taint was added. It is only written for NoExecute taints.",
Ref: spec.MustCreateRef("#/definitions/v1.Time"),
},
},
}, },
Required: []string{"key", "effect"}, Required: []string{"key", "effect"},
}, },
}, },
Dependencies: []string{}, Dependencies: []string{
"v1.Time"},
}, },
"v1.TestType": { "v1.TestType": {
Schema: spec.Schema{ Schema: spec.Schema{
...@@ -8430,14 +8437,14 @@ var OpenAPIDefinitions *openapi.OpenAPIDefinitions = &openapi.OpenAPIDefinitions ...@@ -8430,14 +8437,14 @@ var OpenAPIDefinitions *openapi.OpenAPIDefinitions = &openapi.OpenAPIDefinitions
Properties: map[string]spec.Schema{ Properties: map[string]spec.Schema{
"key": { "key": {
SchemaProps: spec.SchemaProps{ SchemaProps: spec.SchemaProps{
Description: "Required. Key is the taint key that the toleration applies to.", 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{"string"}, Type: []string{"string"},
Format: "", Format: "",
}, },
}, },
"operator": { "operator": {
SchemaProps: spec.SchemaProps{ SchemaProps: spec.SchemaProps{
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.",
Type: []string{"string"}, Type: []string{"string"},
Format: "", Format: "",
}, },
...@@ -8451,11 +8458,18 @@ var OpenAPIDefinitions *openapi.OpenAPIDefinitions = &openapi.OpenAPIDefinitions ...@@ -8451,11 +8458,18 @@ var OpenAPIDefinitions *openapi.OpenAPIDefinitions = &openapi.OpenAPIDefinitions
}, },
"effect": { "effect": {
SchemaProps: spec.SchemaProps{ SchemaProps: spec.SchemaProps{
Description: "Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule and PreferNoSchedule.", Description: "Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.",
Type: []string{"string"}, Type: []string{"string"},
Format: "", Format: "",
}, },
}, },
"tolerationSeconds": {
SchemaProps: spec.SchemaProps{
Description: "TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system.",
Type: []string{"integer"},
Format: "int64",
},
},
}, },
}, },
}, },
......
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