add test for loadbalanceingress IP/Hostname check (#1797)

* add test for loadbalanceingress IP/Hostname check

* update loadIngress test

* remove no_rollout_wait test

* update test to check for GKE label in node

* update gke condition check

Author: BBBmau

kubernetes/resource_kubernetes_deployment_test.go

@@ -856,26 +856,6 @@ func TestAccKubernetesDeployment_with_share_process_namespace(t *testing.T) {
 	})
 }
 
-func TestAccKubernetesDeployment_no_rollout_wait(t *testing.T) {
-	deploymentName := fmt.Sprintf("tf-acc-test-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
-	imageName := nginxImageVersion
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
-		ProviderFactories: testAccProviderFactories,
-		CheckDestroy:      testAccCheckKubernetesDeploymentDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccKubernetesDeploymentConfigWithWaitForRolloutFalse(deploymentName, imageName),
-				Check: resource.ComposeAggregateTestCheckFunc(
-					testAccCheckKubernetesDeploymentRollingOut("kubernetes_deployment.test"),
-					resource.TestCheckResourceAttr("kubernetes_deployment.test", "wait_for_rollout", "false"),
-				),
-			},
-		},
-	})
-}
-
 func TestAccKubernetesDeployment_with_deployment_strategy_rollingupdate_max_surge_30perc_max_unavailable_40perc(t *testing.T) {
 	var conf appsv1.Deployment
 
@@ -1212,21 +1192,6 @@ func testAccCheckKubernetesDeploymentExists(n string, obj *appsv1.Deployment) re
 	}
 }
 
-func testAccCheckKubernetesDeploymentRollingOut(n string) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		d, err := getDeploymentFromResourceName(s, n)
-		if err != nil {
-			return err
-		}
-
-		if d.Status.Replicas == d.Status.ReadyReplicas {
-			return fmt.Errorf("deployment has already rolled out")
-		}
-
-		return nil
-	}
-}
-
 func testAccKubernetesDeploymentConfig_minimal(name, imageName string) string {
 	return fmt.Sprintf(`resource "kubernetes_deployment" "test" {
   metadata {
@@ -2642,48 +2607,6 @@ func testAccKubernetesDeploymentConfigWithAutomountServiceAccountToken(deploymen
 `, deploymentName, imageName)
 }
 
-func testAccKubernetesDeploymentConfigWithWaitForRolloutFalse(deploymentName, imageName string) string {
-	return fmt.Sprintf(`resource "kubernetes_deployment" "test" {
-  metadata {
-    name = %q
-  }
-  spec {
-    replicas = 5
-    selector {
-      match_labels = {
-        "app" = "test"
-      }
-    }
-    template {
-      metadata {
-        name = "test-automount"
-        labels = {
-          "app" = "test"
-        }
-      }
-      spec {
-        container {
-          name  = "nginx"
-          image = %q
-          port {
-            container_port = 80
-          }
-          readiness_probe {
-            initial_delay_seconds = 5
-            http_get {
-              path = "/"
-              port = 80
-            }
-          }
-        }
-      }
-    }
-  }
-  wait_for_rollout = false
-}
-`, deploymentName, nginxImageVersion)
-}
-
 func testAccKubernetesDeploymentConfigLocal(provider, name, imageName string) string {
 	return fmt.Sprintf(`resource "kubernetes_deployment" "test" {
   provider = %s

kubernetes/resource_kubernetes_service_test.go

@@ -157,7 +157,7 @@ func TestAccKubernetesService_loadBalancer(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "spec.0.selector.%", "1"),
 					resource.TestCheckResourceAttr(resourceName, "spec.0.selector.App", "MyApp"),
 					resource.TestCheckResourceAttr(resourceName, "spec.0.type", "LoadBalancer"),
-					resource.TestCheckResourceAttrSet(resourceName, "status.0.load_balancer.0.ingress.0.hostname"),
+					testAccCheckloadBalancerIngressCheck(resourceName),
 					testAccCheckServicePorts(&conf, []api.ServicePort{
 						{
 							Port:       int32(8888),
@@ -811,6 +811,31 @@ func testAccCheckServicePorts(svc *api.Service, expected []api.ServicePort) reso
 	}
 }
 
+func testAccCheckloadBalancerIngressCheck(resourceName string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.RootModule().Resources[resourceName]
+		if !ok {
+			return fmt.Errorf("Not found: %s", resourceName)
+		}
+
+		lb := "status.0.load_balancer.0.ingress.0"
+
+		if ok, _ := isRunningInGke(); ok {
+			ip := fmt.Sprintf("%s.ip", lb)
+			if rs.Primary.Attributes[ip] != "" {
+				return nil
+			}
+			return fmt.Errorf("Attribute '%s' expected to be set for GKE cluster", ip)
+		} else {
+			hostname := fmt.Sprintf("%s.hostname", lb)
+			if rs.Primary.Attributes[hostname] != "" {
+				return nil
+			}
+			return fmt.Errorf("Attribute '%s' expected to be set for EKS cluster", hostname)
+		}
+	}
+}
+
 func testAccCheckKubernetesServiceDestroy(s *terraform.State) error {
 	conn, err := testAccProvider.Meta().(KubeClientsets).MainClientset()