github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/petset.go
View File

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