Merge pull request #34 from tehcyx/feature/featureGates

Feature/feature gates

docs/DEVELOPMENT.md

@@ -22,4 +22,10 @@ Perform the following steps to build the providers:
 
 In order to test the provider you can run `go test ./...` for the unit tests as well as `make testacc` for the Acceptance Tests. If you prefer to only run tests and skip linting and formatting when running Acceptance Tests start them by running `TF_ACC=1 go test ./kind -v -count 1 -parallel 20 -timeout 120m`.
 
-*Note:* Acceptance tests create real resources, and will consume significant resources on the machine they run on.
+*Note:* Acceptance tests create real resources, and will consume significant resources on the machine they run on.
+
+## Release
+
+In order to be able to release a new version this repository needs signed git commits when pushing a tag in order to pick that up and start a new goreleaser run.
+
+To set this up on Windows, follow [this tutorial](https://tau.gr/posts/2018-06-29-how-to-set-up-signing-commits-with-git/).

kind/resource_cluster_test.go

@@ -181,6 +181,21 @@ func TestAccClusterConfigBase(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "kind_config.0.runtime_config.0.api/all", "false"),
 				),
 			},
+			{
+				Config: testAccClusterConfigAndFeatureGates(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.feature_gates.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "kind_config.0.feature_gates.0", "CSIMigration"),
+					resource.TestCheckResourceAttr(resourceName, "kind_config.0.feature_gates.0.CSIMigration", "true"),
+				),
+			},
 		},
 	})
 }
@@ -725,3 +740,20 @@ resource "kind_cluster" "test" {
 }
 `, name)
 }
+
+func testAccClusterConfigAndFeatureGates(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"
+
+	feature_gates {
+		"CSIMigration": "true"
+	}
+  }
+}
+`, name)
+}

kind/schema_kind_config.go

@@ -60,6 +60,13 @@ func kindConfigFields() map[string]*schema.Schema {
 				Type: schema.TypeString,
 			},
 		},
+		"feature_gates": {
+			Type:     schema.TypeMap,
+			Optional: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
 	}
 	return forceNewAll(s)
 }

kind/structure_kind_config.go

@@ -1,6 +1,8 @@
 package kind
 
 import (
+	"strings"
+
 	"sigs.k8s.io/kind/pkg/apis/config/v1alpha4"
 )
 
@@ -38,6 +40,24 @@ func flattenKindConfig(d map[string]interface{}) *v1alpha4.Cluster {
 		}
 	}
 
+	runtimeConfig := mapKeyIfExists(d, "runtime_config")
+	if runtimeConfig != nil {
+		for k, v := range runtimeConfig.(map[string]string) {
+			obj.RuntimeConfig[k] = v
+		}
+	}
+
+	featureGates := mapKeyIfExists(d, "features_gates")
+	if featureGates != nil {
+		for k, v := range featureGates.(map[string]string) {
+			if strings.ToLower(v) == "true" {
+				obj.FeatureGates[k] = true
+			} else {
+				obj.FeatureGates[k] = false
+			}
+		}
+	}
+
 	return obj
 }