Split internal/current config from v1alpha1 and start using k8s.Scheme

Gopkg.toml

@@ -31,10 +31,6 @@ required = [
 
 # normal constraints below
 
-[[constraint]]
-  name = "github.com/ghodss/yaml"
-  version = "1.0.0"
-
 [[constraint]]
   name = "github.com/pkg/errors"
   version = "0.8.0"

cmd/kind/create/cluster/createcluster.go

@@ -68,21 +68,21 @@ func run(flags *flagpole, cmd *cobra.Command, args []string) {
 		}
 		log.Fatal("Aborting due to invalid configuration.")
 	}
-	// create a cluster context and create the cluster
-	ctx, err := cluster.NewContext(flags.Name, flags.Retain)
-	if err != nil {
-		log.Fatalf("Failed to create cluster context! %v", err)
-	}
-	convertedCfg := cfg.ToCurrent()
+	// apply flags overriding config data and validate again
 	if flags.ImageName != "" {
-		convertedCfg.Image = flags.ImageName
-		err := convertedCfg.Validate()
+		cfg.Image = flags.ImageName
+		err := cfg.Validate()
 		if err != nil {
 			log.Errorf("Invalid flags, configuration failed validation: %v", err)
 			log.Fatal("Aborting due to invalid configuration.")
 		}
 	}
-	err = ctx.Create(convertedCfg)
+	// create a cluster context and create the cluster
+	ctx, err := cluster.NewContext(flags.Name, flags.Retain)
+	if err != nil {
+		log.Fatalf("Failed to create cluster context! %v", err)
+	}
+	err = ctx.Create(cfg)
 	if err != nil {
 		log.Fatalf("Failed to create cluster: %v", err)
 	}

hack/update-generated.sh

@@ -32,7 +32,8 @@ GOBIN="${OUTPUT_GOBIN}" go install ./vendor/k8s.io/code-generator/cmd/deepcopy-g
 export PATH="${OUTPUT_GOBIN}:${PATH}"
 go generate ./...
 deepcopy-gen -i ./pkg/cluster/config/ -O zz_generated.deepcopy --go-header-file hack/boilerplate.go.txt
-defaulter-gen -i ./pkg/cluster/config -O zz_generated.default --go-header-file hack/boilerplate.go.txt
+deepcopy-gen -i ./pkg/cluster/config/v1alpha1 -O zz_generated.deepcopy --go-header-file hack/boilerplate.go.txt
+defaulter-gen -i ./pkg/cluster/config/v1alpha1 -O zz_generated.default --go-header-file hack/boilerplate.go.txt
 
 # gofmt the tree
 find . -path "./vendor" -prune -o -name "*.go" -type f -print0 | xargs -0 gofmt -s -w

hack/verify-golint.sh

@@ -36,8 +36,9 @@ get_golint() {
 GOLINT="${GOLINT:-$(get_golint)}"
 
 # we need to do this because golint ./... matches vendor...
-# we also further filter out generated k8s api code in the config package
-# which unfortunately fails lint ...
+# we also further filter out generated k8s api code in the config v1alpha1 package
+# which unfortunately fails lint due to apimachinery conventions ...
+# TODO(fabrizio pandini): makes this smarter (skip only one file)
 go list ./... | \
-  grep -v '^sigs.k8s.io/kind/pkg/cluster/config$' | \
+  grep -v '^sigs.k8s.io/kind/pkg/cluster/config/v1alpha1$' | \
   xargs -L1 "${GOLINT}" -set_exit_status

pkg/cluster/config/convert.go → pkg/cluster/config/encoding/doc.go

@@ -14,10 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package config
-
-// ToCurrent converts Config to config.Config
-// It is implemented to meet config.Any, and just deep copies on this type
-func (c *Config) ToCurrent() *Config {
-	return c.DeepCopy()
-}
+// Package encoding implements utilities for decoding from yaml the `kind` Config
+package encoding