Update controls to support multiple Kubernetes versions.

check/controls.go

@@ -24,6 +24,7 @@ import (
 // Controls holds all controls to check for master nodes.
 type Controls struct {
 	ID     string `yaml:"id"`
+	Version string
 	Text   string
 	Type   NodeType
 	Groups []*Group

check/controls_test.go

@@ -11,22 +11,31 @@ const cfgDir = "../cfg/"
 
 // validate that the files we're shipping are valid YAML
 func TestYamlFiles(t *testing.T) {
-	files, err := ioutil.ReadDir(cfgDir)
+	// TODO: make this list dynamic
-	if err != nil {
+	dirs := []string{"1.6/", "1.7/"}
-		t.Fatalf("error reading %s directory: %v", cfgDir, err)
+
-	}
+	for _, dir := range dirs {
-	for _, file := range files {
+		dir = cfgDir + dir
-		fileName := file.Name()
+
-		in, err := ioutil.ReadFile(cfgDir + fileName)
+		files, err := ioutil.ReadDir(dir)
 		if err != nil {
-			t.Fatalf("error opening file %s: %v", fileName, err)
+			t.Fatalf("error reading %s directory: %v", dir, err)
 		}
 
-		c := new(Controls)
+		for _, file := range files {
 
-		err = yaml.Unmarshal(in, c)
+			fileName := file.Name()
-		if err != nil {
+			in, err := ioutil.ReadFile(dir + fileName)
-			t.Fatalf("failed to load YAML from %s: %v", fileName, err)
+			if err != nil {
+				t.Fatalf("error opening file %s: %v", fileName, err)
+			}
+
+			c := new(Controls)
+
+			err = yaml.Unmarshal(in, c)
+			if err != nil {
+				t.Fatalf("failed to load YAML from %s: %v", fileName, err)
+			}
 		}
 	}
 }