Make attribute ingress_class_name of resource kubernetes_ingress_v1 computed

.changelog/1947.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+`resource/kubernetes_ingress_v1`: make the attribute `spec.ingress_class_name` computed
+```

kubernetes/resource_kubernetes_ingress_test.go

@@ -185,21 +185,6 @@ func TestAccKubernetesIngress_WaitForLoadBalancerGoogleCloud(t *testing.T) {
 	})
 }
 
-func testAccCheckKubernetesIngressForceNew(old, new *api.Ingress, wantNew bool) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		if wantNew {
-			if old.ObjectMeta.UID == new.ObjectMeta.UID {
-				return fmt.Errorf("Expecting new resource for Ingress %s", old.ObjectMeta.UID)
-			}
-		} else {
-			if old.ObjectMeta.UID != new.ObjectMeta.UID {
-				return fmt.Errorf("Expecting Ingress UIDs to be the same: expected %s got %s", old.ObjectMeta.UID, new.ObjectMeta.UID)
-			}
-		}
-		return nil
-	}
-}
-
 func testAccCheckKubernetesIngressDestroy(s *terraform.State) error {
 	conn, err := testAccProvider.Meta().(KubeClientsets).MainClientset()
 
@@ -452,47 +437,3 @@ resource "kubernetes_ingress" "test" {
   wait_for_load_balancer = true
 }`, name, name, name, name, name, name, name)
 }
-
-func testAccKubernetesIngressConfig_stateUpgradev0(provider, name string) string {
-	return fmt.Sprintf(`resource "kubernetes_service" "test" {
-  provider = "%s"
-  metadata {
-    name = "%s"
-  }
-  spec {
-    port {
-      port        = 80
-      target_port = 80
-      protocol    = "TCP"
-    }
-    type = "NodePort"
-  }
-}
-
-resource "kubernetes_ingress" "test" {
-  provider               = "%s"
-  wait_for_load_balancer = false
-  metadata {
-    name = "%s"
-    annotations = {
-      "kubernetes.io/ingress.class"           = "alb"
-      "alb.ingress.kubernetes.io/scheme"      = "internet-facing"
-      "alb.ingress.kubernetes.io/target-type" = "ip"
-    }
-  }
-  spec {
-    rule {
-      http {
-        path {
-          path = "/*"
-          backend {
-            service_name = kubernetes_service.test.metadata.0.name
-            service_port = 80
-          }
-        }
-      }
-    }
-  }
-}
-`, provider, name, provider, name)
-}

kubernetes/resource_kubernetes_ingress_v1.go

@@ -54,6 +54,7 @@ func resourceKubernetesIngressV1Schema() map[string]*schema.Schema {
 						Type:        schema.TypeString,
 						Description: docIngressSpec["ingressClassName"],
 						Optional:    true,
+						Computed:    true,
 					},
 					"default_backend": backendSpecFieldsV1(defaultBackendDescriptionV1),
 					"rule": {

kubernetes/resource_kubernetes_ingress_v1_test.go

@@ -310,19 +310,33 @@ func TestAccKubernetesIngressV1_multipleRulesDifferentHosts(t *testing.T) {
 	})
 }
 
-func testAccCheckKubernetesIngressV1ForceNew(old, new *networking.Ingress, wantNew bool) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		if wantNew {
-			if old.ObjectMeta.UID == new.ObjectMeta.UID {
-				return fmt.Errorf("Expecting new resource for Ingress %s", old.ObjectMeta.UID)
-			}
-		} else {
-			if old.ObjectMeta.UID != new.ObjectMeta.UID {
-				return fmt.Errorf("Expecting Ingress UIDs to be the same: expected %s got %s", old.ObjectMeta.UID, new.ObjectMeta.UID)
-			}
-		}
-		return nil
-	}
+func TestAccKubernetesIngressV1_defaultIngressClass(t *testing.T) {
+	var conf networking.Ingress
+	name := fmt.Sprintf("tf-acc-test-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
+	ingressClass := "default-ingress-class"
+	resourceName := "kubernetes_ingress_v1.test"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+			skipIfClusterVersionLessThan(t, "1.22.0")
+		},
+		IDRefreshName:     resourceName,
+		IDRefreshIgnore:   []string{"metadata.0.resource_version"},
+		ProviderFactories: testAccProviderFactories,
+		CheckDestroy:      testAccCheckKubernetesIngressV1Destroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccKubernetesIngressV1Config_defaultIngressClass(ingressClass, name),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccCheckKubernetesIngressV1Exists(resourceName, &conf),
+					resource.TestCheckResourceAttr(resourceName, "metadata.0.name", name),
+					resource.TestCheckResourceAttr(resourceName, "spec.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "spec.0.ingress_class_name", "default-ingress-class"),
+				),
+			},
+		},
+	})
 }
 
 func testAccCheckKubernetesIngressV1Destroy(s *terraform.State) error {
@@ -724,3 +738,45 @@ func testAccKubernetesIngressV1Config_multipleRulesDifferentHosts(name string) s
   }
 }`, name)
 }
+
+func testAccKubernetesIngressV1Config_defaultIngressClass(ingressClass, name string) string {
+	return fmt.Sprintf(`resource "kubernetes_ingress_class_v1" "test" {
+  metadata {
+    name = "%s"
+    labels = {
+      "app.kubernetes.io/component" = "controller"
+    }
+    annotations = {
+      "ingressclass.kubernetes.io/is-default-class" = "true"
+    }
+  }
+  spec {
+    controller = "k8s.io/ingress-nginx"
+  }
+}
+
+resource "kubernetes_ingress_v1" "test" {
+  metadata {
+    name = "%s"
+  }
+  spec {
+    rule {
+      host = "server.domain.com"
+      http {
+        path {
+          backend {
+            service {
+              name = "app1"
+              port {
+                number = 8080
+              }
+            }
+          }
+          path = "/app1/*"
+        }
+      }
+    }
+  }
+  depends_on = ["kubernetes_ingress_class_v1.test"]
+}`, ingressClass, name)
+}