add ingressClassName (#1057)

Signed-off-by: Christian Niehoff <[email protected]>

Author: r3kzi

kubernetes/resource_kubernetes_ingress.go

@@ -40,6 +40,11 @@ func resourceKubernetesIngress() *schema.Resource {
 				MaxItems:    1,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
+						"ingress_class_name": {
+							Type:        schema.TypeString,
+							Description: docIngressSpec["ingressClassName"],
+							Optional:    true,
+						},
 						"backend": backendSpecFields(defaultBackendDescription),
 						// FIXME: this field is inconsistent with the k8s API 'rules'
 						"rule": {

kubernetes/resource_kubernetes_ingress_test.go

@@ -32,6 +32,7 @@ func TestAccKubernetesIngress_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("kubernetes_ingress.test", "metadata.0.self_link"),
 					resource.TestCheckResourceAttrSet("kubernetes_ingress.test", "metadata.0.uid"),
 					resource.TestCheckResourceAttr("kubernetes_ingress.test", "spec.#", "1"),
+					resource.TestCheckResourceAttr("kubernetes_ingress.test", "spec.0.ingress_class_name", "ingress-class"),
 					resource.TestCheckResourceAttr("kubernetes_ingress.test", "spec.0.backend.#", "1"),
 					resource.TestCheckResourceAttr("kubernetes_ingress.test", "spec.0.backend.0.service_name", "app1"),
 					resource.TestCheckResourceAttr("kubernetes_ingress.test", "spec.0.backend.0.service_port", "443"),
@@ -54,6 +55,7 @@ func TestAccKubernetesIngress_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("kubernetes_ingress.test", "metadata.0.self_link"),
 					resource.TestCheckResourceAttrSet("kubernetes_ingress.test", "metadata.0.uid"),
 					resource.TestCheckResourceAttr("kubernetes_ingress.test", "spec.#", "1"),
+					resource.TestCheckResourceAttr("kubernetes_ingress.test", "spec.0.ingress_class_name", "other-ingress-class"),
 					resource.TestCheckResourceAttr("kubernetes_ingress.test", "spec.0.backend.#", "1"),
 					resource.TestCheckResourceAttr("kubernetes_ingress.test", "spec.0.backend.0.service_name", "svc"),
 					resource.TestCheckResourceAttr("kubernetes_ingress.test", "spec.0.backend.0.service_port", "8443"),
@@ -234,6 +236,7 @@ func testAccKubernetesIngressConfig_basic(name string) string {
     name = "%s"
   }
   spec {
+	ingress_class_name = "ingress-class"
     backend {
       service_name = "app1"
       service_port = 443
@@ -260,6 +263,7 @@ func testAccKubernetesIngressConfig_modified(name string) string {
     name = "%s"
   }
   spec {
+	ingress_class_name = "other-ingress-class"
     backend {
       service_name = "svc"
       service_port = 8443

kubernetes/structure_ingress_spec.go

@@ -55,6 +55,10 @@ func flattenIngressBackend(in *v1beta1.IngressBackend) []interface{} {
 func flattenIngressSpec(in v1beta1.IngressSpec) []interface{} {
 	att := make(map[string]interface{})
 
+	if in.IngressClassName != nil {
+		att["ingress_class_name"] = in.IngressClassName
+	}
+
 	if in.Backend != nil {
 		att["backend"] = flattenIngressBackend(in.Backend)
 	}
@@ -134,6 +138,10 @@ func expandIngressSpec(l []interface{}) v1beta1.IngressSpec {
 	in := l[0].(map[string]interface{})
 	obj := v1beta1.IngressSpec{}
 
+	if v, ok := in["ingress_class_name"].(string); ok && len(v) > 0 {
+		obj.IngressClassName = &v
+	}
+
 	if v, ok := in["backend"].([]interface{}); ok && len(v) > 0 {
 		obj.Backend = expandIngressBackend(v)
 	}