Commit 11c577f0 authored by Robert Rati's avatar Robert Rati

[scheduling] Auto-generated file updates from moving node affinity from

annotations to api fields. #35518
parent 91931c13
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -2517,6 +2517,10 @@ message PodSpec { ...@@ -2517,6 +2517,10 @@ message PodSpec {
// If not specified, the pod will not have a domainname at all. // If not specified, the pod will not have a domainname at all.
// +optional // +optional
optional string subdomain = 17; optional string subdomain = 17;
// If specified, the pod's scheduling constraints
// +optional
optional Affinity affinity = 18;
} }
// PodStatus represents information about the status of a pod. Status may trail the actual // PodStatus represents information about the status of a pod. Status may trail the actual
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -1274,6 +1274,7 @@ var map_PodSpec = map[string]string{ ...@@ -1274,6 +1274,7 @@ var map_PodSpec = map[string]string{
"imagePullSecrets": "ImagePullSecrets is an optional list of references to secrets in the same namespace to use for pulling any of the images used by this PodSpec. If specified, these secrets will be passed to individual puller implementations for them to use. For example, in the case of docker, only DockerConfig type secrets are honored. More info: http://kubernetes.io/docs/user-guide/images#specifying-imagepullsecrets-on-a-pod", "imagePullSecrets": "ImagePullSecrets is an optional list of references to secrets in the same namespace to use for pulling any of the images used by this PodSpec. If specified, these secrets will be passed to individual puller implementations for them to use. For example, in the case of docker, only DockerConfig type secrets are honored. More info: http://kubernetes.io/docs/user-guide/images#specifying-imagepullsecrets-on-a-pod",
"hostname": "Specifies the hostname of the Pod If not specified, the pod's hostname will be set to a system-defined value.", "hostname": "Specifies the hostname of the Pod If not specified, the pod's hostname will be set to a system-defined value.",
"subdomain": "If specified, the fully qualified Pod hostname will be \"<hostname>.<subdomain>.<pod namespace>.svc.<cluster domain>\". If not specified, the pod will not have a domainname at all.", "subdomain": "If specified, the fully qualified Pod hostname will be \"<hostname>.<subdomain>.<pod namespace>.svc.<cluster domain>\". If not specified, the pod will not have a domainname at all.",
"affinity": "If specified, the pod's scheduling constraints",
} }
func (PodSpec) SwaggerDoc() map[string]string { func (PodSpec) SwaggerDoc() map[string]string {
......
...@@ -3064,6 +3064,7 @@ func autoConvert_v1_PodSpec_To_api_PodSpec(in *PodSpec, out *api.PodSpec, s conv ...@@ -3064,6 +3064,7 @@ func autoConvert_v1_PodSpec_To_api_PodSpec(in *PodSpec, out *api.PodSpec, s conv
out.ImagePullSecrets = *(*[]api.LocalObjectReference)(unsafe.Pointer(&in.ImagePullSecrets)) out.ImagePullSecrets = *(*[]api.LocalObjectReference)(unsafe.Pointer(&in.ImagePullSecrets))
out.Hostname = in.Hostname out.Hostname = in.Hostname
out.Subdomain = in.Subdomain out.Subdomain = in.Subdomain
out.Affinity = (*api.Affinity)(unsafe.Pointer(in.Affinity))
return nil return nil
} }
...@@ -3100,6 +3101,7 @@ func autoConvert_api_PodSpec_To_v1_PodSpec(in *api.PodSpec, out *PodSpec, s conv ...@@ -3100,6 +3101,7 @@ func autoConvert_api_PodSpec_To_v1_PodSpec(in *api.PodSpec, out *PodSpec, s conv
out.ImagePullSecrets = *(*[]LocalObjectReference)(unsafe.Pointer(&in.ImagePullSecrets)) out.ImagePullSecrets = *(*[]LocalObjectReference)(unsafe.Pointer(&in.ImagePullSecrets))
out.Hostname = in.Hostname out.Hostname = in.Hostname
out.Subdomain = in.Subdomain out.Subdomain = in.Subdomain
out.Affinity = (*Affinity)(unsafe.Pointer(in.Affinity))
return nil return nil
} }
......
...@@ -2660,6 +2660,15 @@ func DeepCopy_v1_PodSpec(in interface{}, out interface{}, c *conversion.Cloner) ...@@ -2660,6 +2660,15 @@ func DeepCopy_v1_PodSpec(in interface{}, out interface{}, c *conversion.Cloner)
} }
out.Hostname = in.Hostname out.Hostname = in.Hostname
out.Subdomain = in.Subdomain out.Subdomain = in.Subdomain
if in.Affinity != nil {
in, out := &in.Affinity, &out.Affinity
*out = new(Affinity)
if err := DeepCopy_v1_Affinity(*in, *out, c); err != nil {
return err
}
} else {
out.Affinity = nil
}
return nil return nil
} }
} }
......
...@@ -2699,6 +2699,15 @@ func DeepCopy_api_PodSpec(in interface{}, out interface{}, c *conversion.Cloner) ...@@ -2699,6 +2699,15 @@ func DeepCopy_api_PodSpec(in interface{}, out interface{}, c *conversion.Cloner)
} }
out.Hostname = in.Hostname out.Hostname = in.Hostname
out.Subdomain = in.Subdomain out.Subdomain = in.Subdomain
if in.Affinity != nil {
in, out := &in.Affinity, &out.Affinity
*out = new(Affinity)
if err := DeepCopy_api_Affinity(*in, *out, c); err != nil {
return err
}
} else {
out.Affinity = nil
}
return nil return nil
} }
} }
......
...@@ -1577,7 +1577,7 @@ func (x codecSelfer1234) decSliceStatefulSet(v *[]StatefulSet, d *codec1978.Deco ...@@ -1577,7 +1577,7 @@ func (x codecSelfer1234) decSliceStatefulSet(v *[]StatefulSet, d *codec1978.Deco
yyrg131 := len(yyv131) > 0 yyrg131 := len(yyv131) > 0
yyv2131 := yyv131 yyv2131 := yyv131
yyrl131, yyrt131 = z.DecInferLen(yyl131, z.DecBasicHandle().MaxInitLen, 800) yyrl131, yyrt131 = z.DecInferLen(yyl131, z.DecBasicHandle().MaxInitLen, 808)
if yyrt131 { if yyrt131 {
if yyrl131 <= cap(yyv131) { if yyrl131 <= cap(yyv131) {
yyv131 = yyv131[:yyrl131] yyv131 = yyv131[:yyrl131]
......
...@@ -2352,7 +2352,7 @@ func (x codecSelfer1234) decSliceJob(v *[]Job, d *codec1978.Decoder) { ...@@ -2352,7 +2352,7 @@ func (x codecSelfer1234) decSliceJob(v *[]Job, d *codec1978.Decoder) {
yyrg206 := len(yyv206) > 0 yyrg206 := len(yyv206) > 0
yyv2206 := yyv206 yyv2206 := yyv206
yyrl206, yyrt206 = z.DecInferLen(yyl206, z.DecBasicHandle().MaxInitLen, 824) yyrl206, yyrt206 = z.DecInferLen(yyl206, z.DecBasicHandle().MaxInitLen, 832)
if yyrt206 { if yyrt206 {
if yyrl206 <= cap(yyv206) { if yyrl206 <= cap(yyv206) {
yyv206 = yyv206[:yyrl206] yyv206 = yyv206[:yyrl206]
......
...@@ -4247,7 +4247,7 @@ func (x codecSelfer1234) decSliceJob(v *[]Job, d *codec1978.Decoder) { ...@@ -4247,7 +4247,7 @@ func (x codecSelfer1234) decSliceJob(v *[]Job, d *codec1978.Decoder) {
yyrg370 := len(yyv370) > 0 yyrg370 := len(yyv370) > 0
yyv2370 := yyv370 yyv2370 := yyv370
yyrl370, yyrt370 = z.DecInferLen(yyl370, z.DecBasicHandle().MaxInitLen, 824) yyrl370, yyrt370 = z.DecInferLen(yyl370, z.DecBasicHandle().MaxInitLen, 832)
if yyrt370 { if yyrt370 {
if yyrl370 <= cap(yyv370) { if yyrl370 <= cap(yyv370) {
yyv370 = yyv370[:yyrl370] yyv370 = yyv370[:yyrl370]
...@@ -4479,7 +4479,7 @@ func (x codecSelfer1234) decSliceCronJob(v *[]CronJob, d *codec1978.Decoder) { ...@@ -4479,7 +4479,7 @@ func (x codecSelfer1234) decSliceCronJob(v *[]CronJob, d *codec1978.Decoder) {
yyrg382 := len(yyv382) > 0 yyrg382 := len(yyv382) > 0
yyv2382 := yyv382 yyv2382 := yyv382
yyrl382, yyrt382 = z.DecInferLen(yyl382, z.DecBasicHandle().MaxInitLen, 1072) yyrl382, yyrt382 = z.DecInferLen(yyl382, z.DecBasicHandle().MaxInitLen, 1080)
if yyrt382 { if yyrt382 {
if yyrl382 <= cap(yyv382) { if yyrl382 <= cap(yyv382) {
yyv382 = yyv382[:yyrl382] yyv382 = yyv382[:yyrl382]
......
...@@ -21849,7 +21849,7 @@ func (x codecSelfer1234) decSliceDeployment(v *[]Deployment, d *codec1978.Decode ...@@ -21849,7 +21849,7 @@ func (x codecSelfer1234) decSliceDeployment(v *[]Deployment, d *codec1978.Decode
yyrg1828 := len(yyv1828) > 0 yyrg1828 := len(yyv1828) > 0
yyv21828 := yyv1828 yyv21828 := yyv1828
yyrl1828, yyrt1828 = z.DecInferLen(yyl1828, z.DecBasicHandle().MaxInitLen, 856) yyrl1828, yyrt1828 = z.DecInferLen(yyl1828, z.DecBasicHandle().MaxInitLen, 864)
if yyrt1828 { if yyrt1828 {
if yyrl1828 <= cap(yyv1828) { if yyrl1828 <= cap(yyv1828) {
yyv1828 = yyv1828[:yyrl1828] yyv1828 = yyv1828[:yyrl1828]
...@@ -21965,7 +21965,7 @@ func (x codecSelfer1234) decSliceDaemonSet(v *[]DaemonSet, d *codec1978.Decoder) ...@@ -21965,7 +21965,7 @@ func (x codecSelfer1234) decSliceDaemonSet(v *[]DaemonSet, d *codec1978.Decoder)
yyrg1834 := len(yyv1834) > 0 yyrg1834 := len(yyv1834) > 0
yyv21834 := yyv1834 yyv21834 := yyv1834
yyrl1834, yyrt1834 = z.DecInferLen(yyl1834, z.DecBasicHandle().MaxInitLen, 752) yyrl1834, yyrt1834 = z.DecInferLen(yyl1834, z.DecBasicHandle().MaxInitLen, 760)
if yyrt1834 { if yyrt1834 {
if yyrl1834 <= cap(yyv1834) { if yyrl1834 <= cap(yyv1834) {
yyv1834 = yyv1834[:yyrl1834] yyv1834 = yyv1834[:yyrl1834]
...@@ -22197,7 +22197,7 @@ func (x codecSelfer1234) decSliceJob(v *[]Job, d *codec1978.Decoder) { ...@@ -22197,7 +22197,7 @@ func (x codecSelfer1234) decSliceJob(v *[]Job, d *codec1978.Decoder) {
yyrg1846 := len(yyv1846) > 0 yyrg1846 := len(yyv1846) > 0
yyv21846 := yyv1846 yyv21846 := yyv1846
yyrl1846, yyrt1846 = z.DecInferLen(yyl1846, z.DecBasicHandle().MaxInitLen, 824) yyrl1846, yyrt1846 = z.DecInferLen(yyl1846, z.DecBasicHandle().MaxInitLen, 832)
if yyrt1846 { if yyrt1846 {
if yyrl1846 <= cap(yyv1846) { if yyrl1846 <= cap(yyv1846) {
yyv1846 = yyv1846[:yyrl1846] yyv1846 = yyv1846[:yyrl1846]
...@@ -22893,7 +22893,7 @@ func (x codecSelfer1234) decSliceReplicaSet(v *[]ReplicaSet, d *codec1978.Decode ...@@ -22893,7 +22893,7 @@ func (x codecSelfer1234) decSliceReplicaSet(v *[]ReplicaSet, d *codec1978.Decode
yyrg1882 := len(yyv1882) > 0 yyrg1882 := len(yyv1882) > 0
yyv21882 := yyv1882 yyv21882 := yyv1882
yyrl1882, yyrt1882 = z.DecInferLen(yyl1882, z.DecBasicHandle().MaxInitLen, 800) yyrl1882, yyrt1882 = z.DecInferLen(yyl1882, z.DecBasicHandle().MaxInitLen, 808)
if yyrt1882 { if yyrt1882 {
if yyrl1882 <= cap(yyv1882) { if yyrl1882 <= cap(yyv1882) {
yyv1882 = yyv1882[:yyrl1882] yyv1882 = yyv1882[:yyrl1882]
......
...@@ -5373,12 +5373,18 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ ...@@ -5373,12 +5373,18 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{
Format: "", Format: "",
}, },
}, },
"affinity": {
SchemaProps: spec.SchemaProps{
Description: "If specified, the pod's scheduling constraints",
Ref: spec.MustCreateRef("#/definitions/v1.Affinity"),
},
},
}, },
Required: []string{"containers"}, Required: []string{"containers"},
}, },
}, },
Dependencies: []string{ Dependencies: []string{
"v1.Container", "v1.LocalObjectReference", "v1.PodSecurityContext", "v1.Volume"}, "v1.Affinity", "v1.Container", "v1.LocalObjectReference", "v1.PodSecurityContext", "v1.Volume"},
}, },
"v1.PodStatus": { "v1.PodStatus": {
Schema: spec.Schema{ Schema: spec.Schema{
......
...@@ -1547,7 +1547,7 @@ func (x codecSelfer1234) decSliceStatefulSet(v *[]StatefulSet, d *codec1978.Deco ...@@ -1547,7 +1547,7 @@ func (x codecSelfer1234) decSliceStatefulSet(v *[]StatefulSet, d *codec1978.Deco
yyrg127 := len(yyv127) > 0 yyrg127 := len(yyv127) > 0
yyv2127 := yyv127 yyv2127 := yyv127
yyrl127, yyrt127 = z.DecInferLen(yyl127, z.DecBasicHandle().MaxInitLen, 776) yyrl127, yyrt127 = z.DecInferLen(yyl127, z.DecBasicHandle().MaxInitLen, 784)
if yyrt127 { if yyrt127 {
if yyrl127 <= cap(yyv127) { if yyrl127 <= cap(yyv127) {
yyv127 = yyv127[:yyrl127] yyv127 = yyv127[:yyrl127]
......
...@@ -4247,7 +4247,7 @@ func (x codecSelfer1234) decSliceJob(v *[]Job, d *codec1978.Decoder) { ...@@ -4247,7 +4247,7 @@ func (x codecSelfer1234) decSliceJob(v *[]Job, d *codec1978.Decoder) {
yyrg370 := len(yyv370) > 0 yyrg370 := len(yyv370) > 0
yyv2370 := yyv370 yyv2370 := yyv370
yyrl370, yyrt370 = z.DecInferLen(yyl370, z.DecBasicHandle().MaxInitLen, 800) yyrl370, yyrt370 = z.DecInferLen(yyl370, z.DecBasicHandle().MaxInitLen, 808)
if yyrt370 { if yyrt370 {
if yyrl370 <= cap(yyv370) { if yyrl370 <= cap(yyv370) {
yyv370 = yyv370[:yyrl370] yyv370 = yyv370[:yyrl370]
...@@ -4479,7 +4479,7 @@ func (x codecSelfer1234) decSliceCronJob(v *[]CronJob, d *codec1978.Decoder) { ...@@ -4479,7 +4479,7 @@ func (x codecSelfer1234) decSliceCronJob(v *[]CronJob, d *codec1978.Decoder) {
yyrg382 := len(yyv382) > 0 yyrg382 := len(yyv382) > 0
yyv2382 := yyv382 yyv2382 := yyv382
yyrl382, yyrt382 = z.DecInferLen(yyl382, z.DecBasicHandle().MaxInitLen, 1048) yyrl382, yyrt382 = z.DecInferLen(yyl382, z.DecBasicHandle().MaxInitLen, 1056)
if yyrt382 { if yyrt382 {
if yyrl382 <= cap(yyv382) { if yyrl382 <= cap(yyv382) {
yyv382 = yyv382[:yyrl382] yyv382 = yyv382[:yyrl382]
......
...@@ -17413,7 +17413,7 @@ func (x codecSelfer1234) decSliceDeployment(v *[]Deployment, d *codec1978.Decode ...@@ -17413,7 +17413,7 @@ func (x codecSelfer1234) decSliceDeployment(v *[]Deployment, d *codec1978.Decode
yyrg1441 := len(yyv1441) > 0 yyrg1441 := len(yyv1441) > 0
yyv21441 := yyv1441 yyv21441 := yyv1441
yyrl1441, yyrt1441 = z.DecInferLen(yyl1441, z.DecBasicHandle().MaxInitLen, 832) yyrl1441, yyrt1441 = z.DecInferLen(yyl1441, z.DecBasicHandle().MaxInitLen, 840)
if yyrt1441 { if yyrt1441 {
if yyrl1441 <= cap(yyv1441) { if yyrl1441 <= cap(yyv1441) {
yyv1441 = yyv1441[:yyrl1441] yyv1441 = yyv1441[:yyrl1441]
...@@ -17529,7 +17529,7 @@ func (x codecSelfer1234) decSliceDaemonSet(v *[]DaemonSet, d *codec1978.Decoder) ...@@ -17529,7 +17529,7 @@ func (x codecSelfer1234) decSliceDaemonSet(v *[]DaemonSet, d *codec1978.Decoder)
yyrg1447 := len(yyv1447) > 0 yyrg1447 := len(yyv1447) > 0
yyv21447 := yyv1447 yyv21447 := yyv1447
yyrl1447, yyrt1447 = z.DecInferLen(yyl1447, z.DecBasicHandle().MaxInitLen, 728) yyrl1447, yyrt1447 = z.DecInferLen(yyl1447, z.DecBasicHandle().MaxInitLen, 736)
if yyrt1447 { if yyrt1447 {
if yyrl1447 <= cap(yyv1447) { if yyrl1447 <= cap(yyv1447) {
yyv1447 = yyv1447[:yyrl1447] yyv1447 = yyv1447[:yyrl1447]
...@@ -18225,7 +18225,7 @@ func (x codecSelfer1234) decSliceReplicaSet(v *[]ReplicaSet, d *codec1978.Decode ...@@ -18225,7 +18225,7 @@ func (x codecSelfer1234) decSliceReplicaSet(v *[]ReplicaSet, d *codec1978.Decode
yyrg1483 := len(yyv1483) > 0 yyrg1483 := len(yyv1483) > 0
yyv21483 := yyv1483 yyv21483 := yyv1483
yyrl1483, yyrt1483 = z.DecInferLen(yyl1483, z.DecBasicHandle().MaxInitLen, 768) yyrl1483, yyrt1483 = z.DecInferLen(yyl1483, z.DecBasicHandle().MaxInitLen, 776)
if yyrt1483 { if yyrt1483 {
if yyrl1483 <= cap(yyv1483) { if yyrl1483 <= cap(yyv1483) {
yyv1483 = yyv1483[:yyrl1483] yyv1483 = yyv1483[:yyrl1483]
......
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