github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #53030 from cheftako/e2e-aggr 

Automatic merge from submit-queue (batch tested with PRs 51648, 53030, 53009). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>..

Fixed intermitant e2e aggregator test on GKE.

**What this PR does / why we need it**: 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.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #50945 

**Special notes for your reviewer**: Requires we fix the container image to contain this fix to work.

**Release note**:
```release-note NONE
```
pull/6/head
Kubernetes Submit Queue 2017-09-26 12:32:10 -07:00 committed by GitHub
parent f174776e43 a615ac65d8
commit c7c327752f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/sample-apiserver/pkg/registry/wardle/flunder/strategy.go
View File

@ -64,7 +64,7 @@ type flunderStrategy struct {
} }
func (flunderStrategy) NamespaceScoped() bool { func (flunderStrategy) NamespaceScoped() bool {
return false return true
} }
func (flunderStrategy) PrepareForCreate(ctx genericapirequest.Context, obj runtime.Object) { func (flunderStrategy) PrepareForCreate(ctx genericapirequest.Context, obj runtime.Object) {

2
test/e2e/apimachinery/aggregator.go
View File

@ -68,7 +68,7 @@ var _ = SIGDescribe("Aggregator", func() {
framework.SkipUnlessProviderIs("gce", "gke") framework.SkipUnlessProviderIs("gce", "gke")
// Testing a 1.7 version of the sample-apiserver // 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")
}) })
}) })