From a615ac65d8d5718e717bf840bc2f16b41d2ad09c Mon Sep 17 00:00:00 2001 From: Walter Fender Date: Mon, 25 Sep 2017 18:03:26 -0700 Subject: [PATCH] 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. --- .../sample-apiserver/pkg/registry/wardle/flunder/strategy.go | 2 +- test/e2e/apimachinery/aggregator.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git 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 index ab93f2f579..3034667f57 100644 --- 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) { diff --git a/test/e2e/apimachinery/aggregator.go b/test/e2e/apimachinery/aggregator.go index 8550b20a34..90506f44b1 100644 --- 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") }) })