Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix/modify path ingress controller value file #47

Merged
merged 2 commits into from
Mar 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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())
})
})

})

})
})
4 changes: 2 additions & 2 deletions e2e/test/scripts/install_ingress.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ NAMESPACE="ingress-nginx"
if [ -z "${MP_KUBERNETES}" ]; then
# use local version of values.yml
script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
values="${script_dir}/values.yml"
values="${script_dir}/test/scripts/values.yml"
else
# use github hosted master version of values.yml
values="https://raw.githubusercontent.com/bizflycloud/bizflycloud-kubernetes-add-ons/master/ingress-nginx/values.yml"
Expand All @@ -33,4 +33,4 @@ helm upgrade "$STACK" "$CHART" \
--namespace "$NAMESPACE" \
--values "$values" \
--version "$CHART_VERSION" \
--timeout 10m0s
--timeout 10m0s
Loading