diff --git a/deploy/addons/ingress/ingress-rc.yaml b/deploy/addons/ingress/ingress-rc.yaml index 8e2cd643f5eb..1ca0f86cba5f 100644 --- a/deploy/addons/ingress/ingress-rc.yaml +++ b/deploy/addons/ingress/ingress-rc.yaml @@ -77,7 +77,7 @@ spec: spec: terminationGracePeriodSeconds: 60 containers: - - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0-beta.17 + - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0 name: nginx-ingress-controller imagePullPolicy: IfNotPresent readinessProbe: diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go index 864ed164a9f9..c8463f540a34 100644 --- a/test/integration/addons_test.go +++ b/test/integration/addons_test.go @@ -97,11 +97,18 @@ func testIngressController(t *testing.T) { t.Fatalf("waiting for nginx to be up: %s", err) } - expectedStr := "Welcome to nginx!" - runCmd := fmt.Sprintf("curl http://127.0.0.1:80 -H 'Host: nginx.example.com'") - sshCmdOutput, _ := minikubeRunner.SSH(runCmd) - if !strings.Contains(sshCmdOutput, expectedStr) { - t.Fatalf("ExpectedStr sshCmdOutput to be: %s. Output was: %s", expectedStr, sshCmdOutput) + checkIngress := func() error { + expectedStr := "Welcome to nginx!" + runCmd := fmt.Sprintf("curl http://127.0.0.1:80 -H 'Host: nginx.example.com'") + sshCmdOutput, _ := minikubeRunner.SSH(runCmd) + if !strings.Contains(sshCmdOutput, expectedStr) { + return fmt.Errorf("ExpectedStr sshCmdOutput to be: %s. Output was: %s", expectedStr, sshCmdOutput) + } + return nil + } + + if err := util.Retry(t, checkIngress, 3*time.Second, 5); err != nil { + t.Fatalf(err.Error()) } defer kubectlRunner.RunCommand([]string{"delete", "-f", podPath})