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

Merge pull request #40786 from madhusudancs/fed-e2e-svc-nocluster-refactor 

Automatic merge from submit-queue (batch tested with PRs 40385, 40786, 40999, 41026, 40996)

Refactor federated services tests a bit to move a test that requires no cluster creation to a separate block.

Follow up to PR #40769.

cc @kubernetes/sig-federation-pr-reviews
pull/6/head
Kubernetes Submit Queue 2017-02-06 16:51:07 -08:00 committed by GitHub
parent 9abfa6b446 7655cabcf1
commit a09c079654
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
test/e2e_federation/federated-service.go
View File

@ -50,13 +50,37 @@ var FederatedServiceLabels = map[string]string{
"foo": "bar",
}
var _ = framework.KubeDescribe("[Feature:Federation]", func() {
var _ = framework.KubeDescribe("Federated Services [Feature:Federation]", func() {
f := fedframework.NewDefaultFederatedFramework("federated-service")
var clusters map[string]*cluster // All clusters, keyed by cluster name
var federationName string
var primaryClusterName string // The name of the "primary" cluster
var _ = Describe("Federated Services", func() {
var _ = Describe("Without Clusters [NoCluster]", func() {
BeforeEach(func() {
fedframework.SkipUnlessFederated(f.ClientSet)
// Placeholder
})
AfterEach(func() {
fedframework.SkipUnlessFederated(f.ClientSet)
})
It("should succeed when a service is created", func() {
fedframework.SkipUnlessFederated(f.ClientSet)
nsName := f.FederationNamespace.Name
service := createServiceOrFail(f.FederationClientset, nsName, FederatedServiceName)
By(fmt.Sprintf("Creation of service %q in namespace %q succeeded. Deleting service.", service.Name, nsName))
// Cleanup
err := f.FederationClientset.Services(nsName).Delete(service.Name, &metav1.DeleteOptions{})
framework.ExpectNoError(err, "Error deleting service %q in namespace %q", service.Name, service.Namespace)
By(fmt.Sprintf("Deletion of service %q in namespace %q succeeded.", service.Name, nsName))
})
})
var _ = Describe("with clusters", func() {
BeforeEach(func() {
fedframework.SkipUnlessFederated(f.ClientSet)
@ -73,7 +97,7 @@ var _ = framework.KubeDescribe("[Feature:Federation]", func() {
unregisterClusters(clusters, f)
})
Describe("Service creation", func() {
Describe("service creation", func() {
var (
service *v1.Service
nsName string
@ -95,19 +119,6 @@ var _ = framework.KubeDescribe("[Feature:Federation]", func() {
}
})
It("should succeed", func() {
fedframework.SkipUnlessFederated(f.ClientSet)
nsName = f.FederationNamespace.Name
service = createServiceOrFail(f.FederationClientset, nsName, FederatedServiceName)
By(fmt.Sprintf("Creation of service %q in namespace %q succeeded. Deleting service.", service.Name, nsName))
// Cleanup
err := f.FederationClientset.Services(nsName).Delete(service.Name, &metav1.DeleteOptions{})
framework.ExpectNoError(err, "Error deleting service %q in namespace %q", service.Name, service.Namespace)
By(fmt.Sprintf("Deletion of service %q in namespace %q succeeded.", service.Name, nsName))
})
It("should create matching services in underlying clusters", func() {
fedframework.SkipUnlessFederated(f.ClientSet)
@ -144,6 +155,7 @@ var _ = framework.KubeDescribe("[Feature:Federation]", func() {
By(fmt.Sprintf("Verified that services were not deleted from underlying clusters"))
})
})
var _ = Describe("DNS", func() {
var (