Merge pull request #43066 from foxish/fix-statefulset-apps

Automatic merge from submit-queue (batch tested with PRs 43034, 43066) Fix StatefulSet apps e2e tests Fixes https://github.com/kubernetes/kubernetes/issues/42490 ```release-note NONE ``` cc @kubernetes/sig-apps-bugs

Merge pull request #43066 from foxish/fix-statefulset-apps
0ea3e9a2 · Kubernetes Submit Queue · GitHub · dc2b0ee2 · bcc73dbe · 0ea3e9a2
Commit 0ea3e9a2 authored Mar 14, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 14, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

statefulset_utils.go test/e2e/framework/statefulset_utils.go +4 -2

No files found.
--- a/test/e2e/framework/statefulset_utils.go
+++ b/test/e2e/framework/statefulset_utils.go
@@ -101,12 +101,14 @@ func (s *StatefulSetTester) CreateStatefulSet(manifestPath, ns string) *apps.Sta
 		return filepath.Join(manifestPath, file)
 	}
 	ss := StatefulSetFromManifest(mkpath("statefulset.yaml"), ns)
+	svcYaml := generated.ReadOrDie(mkpath("service.yaml"))
+	ssYaml := generated.ReadOrDie(mkpath("statefulset.yaml"))

 	Logf(fmt.Sprintf("creating " + ss.Name + " service"))
-	RunKubectlOrDie("create", "-f", mkpath("service.yaml"), fmt.Sprintf("--namespace=%v", ns))
+	RunKubectlOrDieInput(string(svcYaml[:]), "create", "-f", "-", fmt.Sprintf("--namespace=%v", ns))

 	Logf(fmt.Sprintf("creating statefulset %v/%v with %d replicas and selector %+v", ss.Namespace, ss.Name, *(ss.Spec.Replicas), ss.Spec.Selector))
-	RunKubectlOrDie("create", "-f", mkpath("statefulset.yaml"), fmt.Sprintf("--namespace=%v", ns))
+	RunKubectlOrDieInput(string(ssYaml[:]), "create", "-f", "-", fmt.Sprintf("--namespace=%v", ns))
 	s.WaitForRunningAndReady(*ss.Spec.Replicas, ss)
 	return ss
 }