Skip to content

Commit

Permalink
Hotfix/modify path ingress controller value file (#47)
Browse files Browse the repository at this point in the history
* fix: modify ingress controller's path of the value file

* change: remove ensure function when delete ingress controller
  • Loading branch information
chpiano2000 authored Mar 18, 2024
1 parent aa2e4c5 commit c2aafa9
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions e2e/ccm_e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package e2e_test
import (
"e2e_test/test/framework"
"fmt"

"github.com/bizflycloud/gobizfly"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down Expand Up @@ -105,9 +106,8 @@ var _ = Describe("CCM E2E Tests", func() {
ensureServiceLoadBalancer(namespace, false)
}

destroyIngressController := func(namespace string) {
destroyIngressController := func() {
Expect(f.LoadBalancer.UninstallIngressController()).NotTo(HaveOccurred())
ensureServiceLoadBalancer(namespace, true)
}

Describe("Test", func() {
Expand Down Expand Up @@ -474,9 +474,7 @@ var _ = Describe("CCM E2E Tests", func() {
})

Context("Load Balancer with ingress hostname", func() {
var (
namespace = "ingress-nginx"
)
namespace := "ingress-nginx"

BeforeEach(func() {
namespace = "ingress-nginx"
Expand All @@ -486,7 +484,7 @@ var _ = Describe("CCM E2E Tests", func() {

AfterEach(func() {
By("Destroying Nginx ingress controller")
destroyIngressController(namespace)
destroyIngressController()
})

It("Should have external IP as a hostname", func() {
Expand Down Expand Up @@ -751,8 +749,6 @@ var _ = Describe("CCM E2E Tests", func() {
}).ShouldNot(BeNil())
})
})

})

})
})

0 comments on commit c2aafa9

Please sign in to comment.