Merge pull request #36097 from foxish/fix-e2e-petset

Automatic merge from submit-queue Moving annotation to the PodTemplateSpec **What this PR does / why we need it**: Fixes broken tests. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #35768 **Special notes for your reviewer**: Tested locally. ```release-note NONE ``` cc @kubernetes/sig-apps

Merge pull request #36097 from foxish/fix-e2e-petset
c6028b54 · Kubernetes Submit Queue · GitHub · 2f84a7c8 · bbf3ac73 · c6028b54
Commit c6028b54 authored Nov 03, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 03, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

petset.go test/e2e/petset.go +3 -3

No files found.
--- a/test/e2e/petset.go
+++ b/test/e2e/petset.go
@@ -889,9 +889,6 @@ func newStatefulSet(name, ns, governingSvcName string, replicas int32, petMounts
 		ObjectMeta: api.ObjectMeta{
 			Name:      name,
 			Namespace: ns,
-			Annotations: map[string]string{
-				"pod.alpha.kubernetes.io/initialized": "false",
-			},
 		},
 		Spec: apps.StatefulSetSpec{
 			Selector: &unversioned.LabelSelector{
@@ -901,6 +898,9 @@ func newStatefulSet(name, ns, governingSvcName string, replicas int32, petMounts
 			Template: api.PodTemplateSpec{
 				ObjectMeta: api.ObjectMeta{
 					Labels: labels,
+					Annotations: map[string]string{
+						"pod.alpha.kubernetes.io/initialized": "false",
+					},
 				},
 				Spec: api.PodSpec{
 					Containers: []api.Container{