kubeadm: Improve kubeadm init cmd tests

kubeadm init cmd tests are improved in the following ways:

- Fix a few cases that were always successful (despite completely wrong).
- Add more test cases (for different configs in particular)
- Use dry run, to avoid modifying the system and using kubeadm reset

Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>

cmd/kubeadm/test/cmd/BUILD

@@ -30,7 +30,10 @@ go_test(
         "integration",
         "skip",
     ],
-    deps = ["//vendor/github.com/ghodss/yaml:go_default_library"],
+    deps = [
+        "//vendor/github.com/ghodss/yaml:go_default_library",
+        "//vendor/github.com/renstrom/dedent:go_default_library",
+    ],
 )
 
 filegroup(

cmd/kubeadm/test/cmd/init_test.go

@@ -16,12 +16,16 @@ limitations under the License.
 
 package kubeadm
 
-import "testing"
+import (
+	"testing"
 
-// kubeadmReset executes "kubeadm reset" and restarts kubelet.
+	"github.com/renstrom/dedent"
-func kubeadmReset() error {
+)
-	_, _, err := RunCmd(*kubeadmPath, "reset")
+
-	return err
+func runKubeadmInit(args ...string) (string, string, error) {
+	kubeadmArgs := []string{"init", "--dry-run", "--ignore-preflight-errors=all"}
+	kubeadmArgs = append(kubeadmArgs, args...)
+	return RunCmd(*kubeadmPath, kubeadmArgs...)
 }
 
 func TestCmdInitToken(t *testing.T) {
@@ -30,26 +34,46 @@ func TestCmdInitToken(t *testing.T) {
 		t.Skip()
 	}
 
-	var initTest = []struct {
+	initTest := []struct {
+		name     string
 		args     string
 		expected bool
 	}{
-		{"--discovery=token://abcd:1234567890abcd", false},     // invalid token size
+		{
-		{"--discovery=token://Abcdef:1234567890abcdef", false}, // invalid token non-lowercase
+			name:     "invalid token size",
+			args:     "--token=abcd:1234567890abcd",
+			expected: false,
+		},
+		{
+			name:     "invalid token non-lowercase",
+			args:     "--token=Abcdef:1234567890abcdef",
+			expected: false,
+		},
+		{
+			name:     "valid token is accepted",
+			args:     "--token=abcdef.0123456789abcdef",
+			expected: true,
+		},
 	}
 
 	for _, rt := range initTest {
-		_, _, actual := RunCmd(*kubeadmPath, "init", rt.args, "--skip-preflight-checks")
+		t.Run(rt.name, func(t *testing.T) {
-		if (actual == nil) != rt.expected {
+			_, _, err := runKubeadmInit(rt.args)
-			t.Errorf(
+			if (err == nil) != rt.expected {
-				"failed CmdInitToken running 'kubeadm init %s' with an error: %v\n\texpected: %t\n\t  actual: %t",
+				t.Fatalf(dedent.Dedent(`
-				rt.args,
+					CmdInitToken test case %q failed with an error: %v
-				actual,
+					command 'kubeadm init %s'
-				rt.expected,
+						expected: %t
-				(actual == nil),
+						err: %t
-			)
+					`),
-		}
+					rt.name,
-		kubeadmReset()
+					err,
+					rt.args,
+					rt.expected,
+					(err == nil),
+				)
+			}
+		})
 	}
 }
 
@@ -59,25 +83,41 @@ func TestCmdInitKubernetesVersion(t *testing.T) {
 		t.Skip()
 	}
 
-	var initTest = []struct {
+	initTest := []struct {
+		name     string
 		args     string
 		expected bool
 	}{
-		{"--kubernetes-version=foobar", false},
+		{
+			name:     "invalid version string is detected",
+			args:     "--kubernetes-version=foobar",
+			expected: false,
+		},
+		{
+			name:     "valid version is accepted",
+			args:     "--kubernetes-version=1.11.0",
+			expected: true,
+		},
 	}
 
 	for _, rt := range initTest {
-		_, _, actual := RunCmd(*kubeadmPath, "init", rt.args, "--skip-preflight-checks")
+		t.Run(rt.name, func(t *testing.T) {
-		if (actual == nil) != rt.expected {
+			_, _, err := runKubeadmInit(rt.args)
-			t.Errorf(
+			if (err == nil) != rt.expected {
-				"failed CmdInitKubernetesVersion running 'kubeadm init %s' with an error: %v\n\texpected: %t\n\t  actual: %t",
+				t.Fatalf(dedent.Dedent(`
-				rt.args,
+					CmdInitKubernetesVersion test case %q failed with an error: %v
-				actual,
+					command 'kubeadm init %s'
-				rt.expected,
+						expected: %t
-				(actual == nil),
+						err: %t
-			)
+					`),
-		}
+					rt.name,
-		kubeadmReset()
+					err,
+					rt.args,
+					rt.expected,
+					(err == nil),
+				)
+			}
+		})
 	}
 }
 
@@ -87,26 +127,56 @@ func TestCmdInitConfig(t *testing.T) {
 		t.Skip()
 	}
 
-	var initTest = []struct {
+	initTest := []struct {
+		name     string
 		args     string
 		expected bool
 	}{
-		{"--config=foobar", false},
+		{
-		{"--config=/does/not/exist/foo/bar", false},
+			name:     "fail on non existing path",
+			args:     "--config=/does/not/exist/foo/bar",
+			expected: false,
+		},
+		{
+			name:     "can't load v1alpha1 config",
+			args:     "--config=testdata/init/v1alpha1.yaml",
+			expected: false,
+		},
+		{
+			name:     "can load v1alpha2 config",
+			args:     "--config=testdata/init/v1alpha2.yaml",
+			expected: true,
+		},
+		{
+			name:     "can load v1alpha3 config",
+			args:     "--config=testdata/init/v1alpha3.yaml",
+			expected: true,
+		},
+		{
+			name:     "don't allow mixed arguments",
+			args:     "--kubernetes-version=1.11.0 --config=testdata/init/v1alpha3.yaml",
+			expected: false,
+		},
 	}
 
 	for _, rt := range initTest {
-		_, _, actual := RunCmd(*kubeadmPath, "init", rt.args, "--skip-preflight-checks")
+		t.Run(rt.name, func(t *testing.T) {
-		if (actual == nil) != rt.expected {
+			_, _, err := runKubeadmInit(rt.args)
-			t.Errorf(
+			if (err == nil) != rt.expected {
-				"failed CmdInitConfig running 'kubeadm init %s' with an error: %v\n\texpected: %t\n\t  actual: %t",
+				t.Fatalf(dedent.Dedent(`
-				rt.args,
+						CmdInitConfig test case %q failed with an error: %v
-				actual,
+						command 'kubeadm init %s'
-				rt.expected,
+							expected: %t
-				(actual == nil),
+							err: %t
-			)
+						`),
-		}
+					rt.name,
-		kubeadmReset()
+					err,
+					rt.args,
+					rt.expected,
+					(err == nil),
+				)
+			}
+		})
 	}
 }
 
@@ -116,52 +186,50 @@ func TestCmdInitAPIPort(t *testing.T) {
 		t.Skip()
 	}
 
-	var initTest = []struct {
+	initTest := []struct {
+		name     string
 		args     string
 		expected bool
 	}{
-		{"--api-port=foobar", false},
+		{
+			name:     "fail on non-string port",
+			args:     "--apiserver-bind-port=foobar",
+			expected: false,
+		},
+		{
+			name:     "fail on too large port number",
+			args:     "--apiserver-bind-port=100000",
+			expected: false,
+		},
+		{
+			name:     "fail on negative port number",
+			args:     "--apiserver-bind-port=-6000",
+			expected: false,
+		},
+		{
+			name:     "accept a valid port number",
+			args:     "--apiserver-bind-port=6000",
+			expected: true,
+		},
 	}
 
 	for _, rt := range initTest {
-		_, _, actual := RunCmd(*kubeadmPath, "init", rt.args, "--skip-preflight-checks")
+		t.Run(rt.name, func(t *testing.T) {
-		if (actual == nil) != rt.expected {
+			_, _, err := runKubeadmInit(rt.args)
-			t.Errorf(
+			if (err == nil) != rt.expected {
-				"failed CmdInitAPIPort running 'kubeadm init %s' with an error: %v\n\texpected: %t\n\t  actual: %t",
+				t.Fatalf(dedent.Dedent(`
-				rt.args,
+							CmdInitAPIPort test case %q failed with an error: %v
-				actual,
+							command 'kubeadm init %s'
-				rt.expected,
+								expected: %t
-				(actual == nil),
+								err: %t
-			)
+							`),
-		}
+					rt.name,
-		kubeadmReset()
+					err,
-	}
+					rt.args,
-}
+					rt.expected,
-
+					(err == nil),
-func TestCmdInitArgsMixed(t *testing.T) {
+				)
-	if *kubeadmCmdSkip {
+			}
-		t.Log("kubeadm cmd tests being skipped")
+		})
-		t.Skip()
-	}
-
-	var initTest = []struct {
-		args     string
-		expected bool
-	}{
-		{"--api-port=1000 --config=/etc/kubernets/kubeadm.config", false},
-	}
-
-	for _, rt := range initTest {
-		_, _, actual := RunCmd(*kubeadmPath, "init", rt.args, "--skip-preflight-checks")
-		if (actual == nil) != rt.expected {
-			t.Errorf(
-				"failed CmdInitArgsMixed running 'kubeadm init %s' with an error: %v\n\texpected: %t\n\t  actual: %t",
-				rt.args,
-				actual,
-				rt.expected,
-				(actual == nil),
-			)
-		}
-		kubeadmReset()
 	}
 }

cmd/kubeadm/test/cmd/join_test.go

@@ -18,6 +18,12 @@ package kubeadm
 
 import "testing"
 
+// kubeadmReset executes "kubeadm reset" and restarts kubelet.
+func kubeadmReset() error {
+	_, _, err := RunCmd(*kubeadmPath, "reset")
+	return err
+}
+
 func TestCmdJoinConfig(t *testing.T) {
 	if *kubeadmCmdSkip {
 		t.Log("kubeadm cmd tests being skipped")

cmd/kubeadm/test/cmd/testdata/init/v1alpha1.yaml

@@ -0,0 +1,2 @@
+apiVersion: kubeadm.k8s.io/v1alpha1
+kind: MasterConfiguration

cmd/kubeadm/test/cmd/testdata/init/v1alpha2.yaml

@@ -0,0 +1,2 @@
+apiVersion: kubeadm.k8s.io/v1alpha2
+kind: MasterConfiguration

cmd/kubeadm/test/cmd/testdata/init/v1alpha3.yaml

@@ -0,0 +1,2 @@
+apiVersion: kubeadm.k8s.io/v1alpha3
+kind: InitConfiguration