DevFW-CICD/ingress-nginx-helm
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix flaky e2e tests by always waiting after redeploying the ingress controller (#2283)

Browse source
This commit is contained in:
Alvaro Aleman 2018-04-02 01:37:27 +02:00 committed by Manuel Alejandro de Brito Fontes
parent ee46f486c7
commit 9b4d7f28d0
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
test/e2e/lua/dynamic_configuration.go
View file

@ -51,8 +51,6 @@ var _ = framework.IngressNginxDescribe("Dynamic Configuration", func() {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(ing).NotTo(BeNil()) Expect(ing).NotTo(BeNil())
time.Sleep(5 * time.Second)
err = f.WaitForNginxServer(host, err = f.WaitForNginxServer(host,
func(server string) bool { func(server string) bool {
return strings.Contains(server, "proxy_pass http://upstream_balancer;") return strings.Contains(server, "proxy_pass http://upstream_balancer;")
@ -195,7 +193,11 @@ func enableDynamicConfiguration(kubeClientSet kubernetes.Interface) error {
args = append(args, "--enable-dynamic-configuration") args = append(args, "--enable-dynamic-configuration")
deployment.Spec.Template.Spec.Containers[0].Args = args deployment.Spec.Template.Spec.Containers[0].Args = args
_, err := kubeClientSet.AppsV1beta1().Deployments("ingress-nginx").Update(deployment) _, err := kubeClientSet.AppsV1beta1().Deployments("ingress-nginx").Update(deployment)
return err if err != nil {
return err
}
time.Sleep(15 * time.Second)
return nil
}) })
} }
@ -211,7 +213,11 @@ func disableDynamicConfiguration(kubeClientSet kubernetes.Interface) error {
} }
deployment.Spec.Template.Spec.Containers[0].Args = newArgs deployment.Spec.Template.Spec.Containers[0].Args = newArgs
_, err := kubeClientSet.AppsV1beta1().Deployments("ingress-nginx").Update(deployment) _, err := kubeClientSet.AppsV1beta1().Deployments("ingress-nginx").Update(deployment)
return err if err != nil {
return err
}
time.Sleep(15 * time.Second)
return nil
}) })
} }