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

Merge pull request #41505 from perotinus/fixnsdeletione2etest

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 41505, 41484, 41544, 41514, 41022)

[Federation] Fixes the newly-added test for replicaset deletion upon namespace deletion.

See #41278 for the original test.

**Release note**:
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-02-16 14:28:14 -08:00 committed by GitHub
commit fd788f12b2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e_federation/federated-namespace.go
View File

@ -102,7 +102,7 @@ var _ = framework.KubeDescribe("Federation namespace [Feature:Federation]", func
It("deletes replicasets in the namespace when the namespace is deleted", func() { It("deletes replicasets in the namespace when the namespace is deleted", func() {
fedframework.SkipUnlessFederated(f.ClientSet) fedframework.SkipUnlessFederated(f.ClientSet)
nsName := createNamespace(f.FederationClientset.Core().Namespaces()) nsName = createNamespace(f.FederationClientset.Core().Namespaces())
rsName := v1.SimpleNameGenerator.GenerateName(replicaSetNamePrefix) rsName := v1.SimpleNameGenerator.GenerateName(replicaSetNamePrefix)
replicaCount := int32(2) replicaCount := int32(2)
rs := &v1beta1.ReplicaSet{ rs := &v1beta1.ReplicaSet{