From 8ab7dd3ce9161ca9e8262b82876c56cc021665b5 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publish-robot@users.noreply.github.com>
Date: Fri, 13 Jan 2017 15:19:43 +0000
Subject: [PATCH] published by bot
 (https://github.com/kubernetes/contrib/tree/master/mungegithub)

copied from https://github.com/kubernetes/kubernetes.git, branch master,
last commit is 3fa44312adcd9ec69a18bf615f672fd30571d7c2
---
 pkg/api/v1/defaults.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkg/api/v1/defaults.go b/pkg/api/v1/defaults.go
index 1476b9d8..92ddd384 100644
--- a/pkg/api/v1/defaults.go
+++ b/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 {