github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40769 from madhusudancs/fed-e2e-nocluster

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 40645, 40541, 40769)

[Federation] Marked the tests that don't need registered clusters so.

Somewhat related to issue #40766. 

cc @kubernetes/sig-federation-pr-reviews
This commit is contained in:
Kubernetes Submit Queue 2017-01-31 22:00:39 -08:00 committed by GitHub
commit 1b67b0da20
7 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e_federation/federated-daemonset.go
View File

@ -93,6 +93,7 @@ var _ = framework.KubeDescribe("Federation daemonsets [Feature:Federation]", fun
verifyCascadingDeletionForDS(f.FederationClientset, clusters, &orphanDependents, nsName)
By(fmt.Sprintf("Verified that daemonsets were not deleted from underlying clusters"))
})
It("should not be deleted from underlying clusters when OrphanDependents is nil", func() {
fedframework.SkipUnlessFederated(f.ClientSet)
nsName := f.FederationNamespace.Name

4
test/e2e_federation/federated-deployment.go
View File

@ -45,7 +45,7 @@ const (
var _ = framework.KubeDescribe("Federation deployments [Feature:Federation]", func() {
f := fedframework.NewDefaultFederatedFramework("federation-deployment")
Describe("Deployment objects", func() {
Describe("Deployment objects [NoCluster]", func() {
AfterEach(func() {
fedframework.SkipUnlessFederated(f.ClientSet)
@ -89,7 +89,7 @@ var _ = framework.KubeDescribe("Federation deployments [Feature:Federation]", fu
unregisterClusters(clusters, f)
})
It("should create and update matching deployments in underling clusters", func() {
It("should create and update matching deployments in underlying clusters", func() {
nsName := f.FederationNamespace.Name
dep := createDeploymentOrFail(f.FederationClientset, nsName)
defer func() {

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

@ -58,7 +58,7 @@ var _ = framework.KubeDescribe("Federated ingresses [Feature:Federation]", func(
// Create/delete ingress api objects
// Validate federation apiserver, does not rely on underlying clusters or federation ingress controller.
Describe("Federated Ingresses", func() {
Describe("Federated Ingresses [NoCluster]", func() {
AfterEach(func() {
nsName := f.FederationNamespace.Name
// Delete all ingresses.

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

@ -47,7 +47,7 @@ const (
var _ = framework.KubeDescribe("Federation replicasets [Feature:Federation]", func() {
f := fedframework.NewDefaultFederatedFramework("federation-replicaset")
Describe("ReplicaSet objects", func() {
Describe("ReplicaSet objects [NoCluster]", func() {
AfterEach(func() {
fedframework.SkipUnlessFederated(f.ClientSet)

5
test/e2e_federation/federation-apiserver.go
View File

@ -35,7 +35,7 @@ import (
var _ = framework.KubeDescribe("Federation apiserver [Feature:Federation]", func() {
f := fedframework.NewDefaultFederatedFramework("federation-cluster")
Describe("Cluster objects", func() {
Describe("Cluster objects [Serial]", func() {
AfterEach(func() {
fedframework.SkipUnlessFederated(f.ClientSet)
@ -84,7 +84,8 @@ var _ = framework.KubeDescribe("Federation apiserver [Feature:Federation]", func
framework.Logf("Verified that zero clusters remain")
})
})
Describe("Admission control", func() {
Describe("Admission control [NoCluster]", func() {
AfterEach(func() {
fedframework.SkipUnlessFederated(f.ClientSet)
})

2
test/e2e_federation/federation-authn.go
View File

@ -33,7 +33,7 @@ import (
var _ = framework.KubeDescribe("[Feature:Federation]", func() {
f := fedframework.NewDefaultFederatedFramework("federation-apiserver-authn")
var _ = Describe("Federation API server authentication", func() {
var _ = Describe("Federation API server authentication [NoCluster]", func() {
BeforeEach(func() {
fedframework.SkipUnlessFederated(f.ClientSet)
})

2
test/e2e_federation/federation-event.go
View File

@ -37,7 +37,7 @@ const (
var _ = framework.KubeDescribe("Federation events [Feature:Federation]", func() {
f := fedframework.NewDefaultFederatedFramework("federation-event")
Describe("Event objects", func() {
Describe("Event objects [NoCluster]", func() {
AfterEach(func() {
fedframework.SkipUnlessFederated(f.ClientSet)