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
pull/6/head
Kubernetes Submit Queue 2016-11-03 02:08:23 -07:00 committed by GitHub
commit c6028b547c
1 changed files with 3 additions and 3 deletions

View File

@ -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{