github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39478 from rrati/pod-affinity-api-fields

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 39803, 39698, 39537, 39478)

[scheduling] Moved pod affinity and anti-affinity from annotations to api fields #25319

Converted pod affinity and anti-affinity from annotations to api fields

Related: #25319
Related: #34508

**Release note**:
```Pod affinity and anti-affinity has moved from annotations to api fields in the pod spec.  Pod affinity or anti-affinity that is defined in the annotations will be ignored.```
This commit is contained in:
Kubernetes Submit Queue
2017-01-12 15:06:33 -08:00
committed by GitHub
parent d50c027d0c 6a3ad93d6c
commit 082ce00eca
26 changed files with 1245 additions and 1309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/api/testing/pod_specs.go
View File

@@ -29,7 +29,6 @@ func DeepEqualSafePodSpec() api.PodSpec {
DNSPolicy: api.DNSClusterFirst,
TerminationGracePeriodSeconds: &grace,
SecurityContext: &api.PodSecurityContext{},
Affinity: &api.Affinity{},
}
}