add a test and add mapping for kube_proxy_mode assignement

tehcyx · Aug 25, 2023 · 8ee10c1 · 8ee10c1
1 parent 32792a9
commit 8ee10c1
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/kind/resource_cluster_test.go b/kind/resource_cluster_test.go
@@ -181,6 +181,20 @@ func TestAccClusterConfigBase(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "kind_config.0.networking.0.api_server_port", "6443"),
 				),
 			},
+			{
+				Config: testAccClusterConfigAndExtraWithNetworkValuesKubeProxyDisabled(clusterName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckClusterCreate(resourceName),
+					resource.TestCheckResourceAttr(resourceName, "name", clusterName),
+					resource.TestCheckNoResourceAttr(resourceName, "node_image"),
+					resource.TestCheckResourceAttr(resourceName, "wait_for_ready", "false"),
+					resource.TestCheckResourceAttr(resourceName, "kind_config.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "kind_config.0.kind", "Cluster"),
+					resource.TestCheckResourceAttr(resourceName, "kind_config.0.api_version", "kind.x-k8s.io/v1alpha4"),
+					resource.TestCheckResourceAttr(resourceName, "kind_config.0.networking.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "kind_config.0.networking.0.kube_proxy_mode", "none"),
+				),
+			},
 			{
 				Config: testAccClusterConfigAndRuntimeConfig(clusterName),
 				Check: resource.ComposeTestCheckFunc(
@@ -755,6 +769,23 @@ resource "kind_cluster" "test" {
 `, name)
 }
 
+func testAccClusterConfigAndExtraWithNetworkValuesKubeProxyDisabled(name string) string {
+	return fmt.Sprintf(`
+resource "kind_cluster" "test" {
+  name = "%s"
+  wait_for_ready = false
+  kind_config {
+	kind = "Cluster"
+	api_version = "kind.x-k8s.io/v1alpha4"
+
+	networking {
+		kube_proxy_mode = "none"
+	}
+  }
+}
+`, name)
+}
+
 func testAccClusterConfigAndRuntimeConfig(name string) string {
 	return fmt.Sprintf(`
 resource "kind_cluster" "test" {

diff --git a/kind/structure_kind_config.go b/kind/structure_kind_config.go
@@ -157,7 +157,10 @@ func flattenKindConfigNetworking(d map[string]interface{}) v1alpha4.Networking {
 			obj.KubeProxyMode = v1alpha4.IPTablesProxyMode
 		case string(v1alpha4.IPVSProxyMode):
 			obj.KubeProxyMode = v1alpha4.IPVSProxyMode
+		case "none":
+			obj.KubeProxyMode = "none"
 		}
+
 	}
 
 	podSubnet := mapKeyIfExists(d, "pod_subnet")