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

fields. #25319
2016-12-08 10:14:21 -05:00
parent 1854d48238
commit 6a3ad93d6c
26 changed files with 1245 additions and 1309 deletions
--- a/staging/src/k8s.io/client-go/pkg/api/v1/defaults.go
+++ b/staging/src/k8s.io/client-go/pkg/api/v1/defaults.go
@@ -175,9 +175,6 @@ func SetDefaults_PodSpec(obj *PodSpec) {
 		period := int64(DefaultTerminationGracePeriodSeconds)
 		obj.TerminationGracePeriodSeconds = &period
 	}
-	if obj.Affinity == nil {
-		obj.Affinity = &Affinity{}
-	}
 }
 func SetDefaults_Probe(obj *Probe) {
 	if obj.TimeoutSeconds == 0 {