From 797925f183230c2e0a3e73251b4ed9caaa394925 Mon Sep 17 00:00:00 2001
From: kairen <kyle.b@inwinstack.com>
Date: Sun, 10 Dec 2017 02:19:50 +0800
Subject: [PATCH] Update ingress controller, and fix integration test

---
 deploy/addons/ingress/ingress-rc.yaml |  2 +-
 pkg/minikube/constants/constants.go   | 10 ++++++++++
 test/integration/addons_test.go       | 17 ++++++++++++-----
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/deploy/addons/ingress/ingress-rc.yaml b/deploy/addons/ingress/ingress-rc.yaml
index 8e2cd643f..1ca0f86cb 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/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go
index 1eca5fa83..9633284bc 100644
--- a/pkg/minikube/constants/constants.go
+++ b/pkg/minikube/constants/constants.go
@@ -170,6 +170,11 @@ var LocalkubeCachedImages = []string{
 	// Dashboard
 	"gcr.io/google_containers/kubernetes-dashboard-amd64:v1.6.3",
 
+	// Ingress Controller
+	"nginx:alpine",
+	"gcr.io/google_containers/defaultbackend:1.4",
+	"quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0",
+
 	// DNS
 	"gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5",
 	"gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5",
@@ -190,6 +195,11 @@ func GetKubeadmCachedImages(version string) []string {
 		// Dashboard
 		"gcr.io/google_containers/kubernetes-dashboard-amd64:v1.6.3",
 
+		// Ingress Controller
+		"nginx:alpine",
+		"gcr.io/google_containers/defaultbackend:1.4",
+		"quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0",
+
 		// Addon Manager
 		"gcr.io/google-containers/kube-addon-manager:v6.4-beta.2",
 
diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go
index 864ed164a..c8463f540 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})
-- 
GitLab