Fixed intermittant e2e aggregator test on GKE.

Fixes issues/50945. Issue was caused by another test cleaning up its namespace. This caused the namespace controller to try to clean up that namespace. This involves deleting all flunders under that namespace. However the sample-apiserver was not honoring the namespace filter. So the flunders for the test would randomly disappear. Fixed image path to pick up newly built fixes from this PR.

Fixed intermittant e2e aggregator test on GKE.
a615ac65 · Walter Fender · e3a83dae · a615ac65 · a615ac65
Commit a615ac65 authored Sep 25, 2017 by Walter Fender
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

strategy.go .../sample-apiserver/pkg/registry/wardle/flunder/strategy.go +1 -1

aggregator.go test/e2e/apimachinery/aggregator.go +1 -1

No files found.
--- a/staging/src/k8s.io/sample-apiserver/pkg/registry/wardle/flunder/strategy.go
+++ b/staging/src/k8s.io/sample-apiserver/pkg/registry/wardle/flunder/strategy.go
@@ -64,7 +64,7 @@ type flunderStrategy struct {
 }

 func (flunderStrategy) NamespaceScoped() bool {
-	return false
+	return true
 }

 func (flunderStrategy) PrepareForCreate(ctx genericapirequest.Context, obj runtime.Object) {

--- a/test/e2e/apimachinery/aggregator.go
+++ b/test/e2e/apimachinery/aggregator.go
@@ -68,7 +68,7 @@ var _ = SIGDescribe("Aggregator", func() {
 		framework.SkipUnlessProviderIs("gce", "gke")

 		// Testing a 1.7 version of the sample-apiserver
-		TestSampleAPIServer(f, "gcr.io/kubernetes-e2e-test-images/k8s-aggregator-sample-apiserver-amd64:1.7", "sample-system")
+		TestSampleAPIServer(f, "gcr.io/kubernetes-e2e-test-images/k8s-aggregator-sample-apiserver-amd64:1.7v2", "sample-system")
 	})
 })