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

Adjust nginx lb timeout in tests

Browse Source 
In addition delete the service & lb before ending to test to avoid the case
when deleting the namespace times out due to long LB deletion.

Ref.  https://github.com/kubernetes/kubernetes/issues/82695
This commit is contained in:
Matt Matejczyk 2019-09-13 09:46:10 +02:00
parent 9fa7889e98
commit 532298c399
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e/framework/ingress/ingress_utils.go
View File

@ -831,6 +831,7 @@ type NginxIngressController struct {
rc *v1.ReplicationController rc *v1.ReplicationController
pod *v1.Pod pod *v1.Pod
Client clientset.Interface Client clientset.Interface
lbSvc *v1.Service
} }
// Init initializes the NginxIngressController // Init initializes the NginxIngressController
@ -848,8 +849,8 @@ func (cont *NginxIngressController) Init() {
{Name: "https", Port: 443}, {Name: "https", Port: 443},
{Name: "stats", Port: 18080}} {Name: "stats", Port: 18080}}
}) })
svc := serviceJig.WaitForLoadBalancerOrFail(cont.Ns, "nginx-ingress-lb", e2eservice.LoadBalancerCreateTimeoutDefault) cont.lbSvc = serviceJig.WaitForLoadBalancerOrFail(cont.Ns, "nginx-ingress-lb", e2eservice.GetServiceLoadBalancerCreationTimeout(cont.Client))
serviceJig.SanityCheckService(svc, v1.ServiceTypeLoadBalancer) serviceJig.SanityCheckService(cont.lbSvc, v1.ServiceTypeLoadBalancer)
read := func(file string) string { read := func(file string) string {
return string(testfiles.ReadOrDie(filepath.Join(IngressManifestPath, "nginx", file))) return string(testfiles.ReadOrDie(filepath.Join(IngressManifestPath, "nginx", file)))
@ -873,6 +874,15 @@ func (cont *NginxIngressController) Init() {
framework.Logf("ingress controller running in pod %v", cont.pod.Name) framework.Logf("ingress controller running in pod %v", cont.pod.Name)
} }
// TearDown cleans up the NginxIngressController.
func (cont *NginxIngressController) TearDown() {
if cont.lbSvc == nil {
framework.Logf("No LoadBalancer service created, no cleanup necessary")
return
}
e2eservice.WaitForServiceDeletedWithFinalizer(cont.Client, cont.Ns, cont.lbSvc.Name)
}
func generateBacksideHTTPSIngressSpec(ns string) *networkingv1beta1.Ingress { func generateBacksideHTTPSIngressSpec(ns string) *networkingv1beta1.Ingress {
return &networkingv1beta1.Ingress{ return &networkingv1beta1.Ingress{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{

1
test/e2e/network/ingress.go
View File

@ -738,6 +738,7 @@ var _ = SIGDescribe("Loadbalancing: L7", func() {
if ginkgo.CurrentGinkgoTestDescription().Failed { if ginkgo.CurrentGinkgoTestDescription().Failed {
framework.DescribeIng(ns) framework.DescribeIng(ns)
} }
defer nginxController.TearDown()
if jig.Ingress == nil { if jig.Ingress == nil {
ginkgo.By("No ingress created, no cleanup necessary") ginkgo.By("No ingress created, no cleanup necessary")
return return