Merge pull request #955 from threefoldtech/fix-k8s-module-test

fix k8s using module test

Author: Eslam-Nawara

integrationtests/k8s_test.go

@@ -11,7 +11,7 @@ import (
 )
 
 // RequireNodesAreReady runs `kubectl get node` on the master node and requires that all nodes are ready
-func RequireNodesAreReady(t *testing.T, terraformOptions *terraform.Options, privateKey string) {
+func RequireNodesAreReady(t *testing.T, terraformOptions *terraform.Options, privateKey string, nodesNumber int) {
 	t.Helper()
 
 	masterYggIP := terraform.Output(t, terraformOptions, "mr_ygg_ip")
@@ -21,9 +21,8 @@ func RequireNodesAreReady(t *testing.T, terraformOptions *terraform.Options, pri
 
 	output, err := RemoteRun("root", masterYggIP, "export KUBECONFIG=/etc/rancher/k3s/k3s.yaml && kubectl get node", privateKey)
 	output = strings.TrimSpace(output)
-	require.Empty(t, err)
+	require.NoError(t, err)
 
-	nodesNumber := 2
 	numberOfReadyNodes := strings.Count(output, "Ready")
 	require.True(t, numberOfReadyNodes == nodesNumber, "number of ready nodes is not equal to number of nodes only %d nodes are ready", numberOfReadyNodes)
 }
@@ -82,7 +81,7 @@ func TestK8s(t *testing.T) {
 		require.True(t, ok)
 
 		// ssh to master node
-		RequireNodesAreReady(t, terraformOptions, privateKey)
+		RequireNodesAreReady(t, terraformOptions, privateKey, 2)
 	})
 
 	t.Run("k8s_invalid_names", func(t *testing.T) {

integrationtests/k8s_using_module.go renamed to integrationtests/k8s_using_module_test.go

@@ -22,8 +22,6 @@ func TestModuleK8s(t *testing.T) {
 
 	*/
 
-	t.Skip("https://github.com/threefoldtech/terraform-provider-grid/issues/770")
-
 	publicKey, privateKey, err := GenerateSSHKeyPair()
 	if err != nil {
 		t.Fatalf("failed to generate ssh key pair: %s", err.Error())
@@ -41,13 +39,14 @@ func TestModuleK8s(t *testing.T) {
 		FreeMRU:  &freeMRU,
 		FreeSRU:  &freeSRU,
 		TotalCRU: &freeCRU,
+		FarmIDs:  []uint64{1},
 	}
 
-	nodes, err := deployer.FilterNodes(context.Background(), tfPlugin, f, []uint64{freeSRU}, []uint64{}, []uint64{}, 3)
-	if err != nil || len(nodes) != 3 {
-		t.Fatal("grid proxy could not find nodes with suitable resources")
-	}
+	nodes, err := deployer.FilterNodes(context.Background(), tfPlugin, f, []uint64{freeSRU}, []uint64{}, []uint64{})
 	require.NoError(t, err)
+	if len(nodes) < 3 {
+		t.Skip("couldn't find enough nodes")
+	}
 
 	masterNode := nodes[0].NodeID
 	worker0Node := nodes[1].NodeID
@@ -57,7 +56,7 @@ func TestModuleK8s(t *testing.T) {
 		TerraformDir: "./k8s_using_module",
 		Vars: map[string]interface{}{
 			"ssh":           publicKey,
-			"network_nodes": []int{12, masterNode},
+			"network_nodes": []int{masterNode, worker0Node, worker1Node},
 			"master": map[string]interface{}{
 				"name":        "mr",
 				"node":        masterNode,
@@ -101,7 +100,7 @@ func TestModuleK8s(t *testing.T) {
 	require.NoError(t, err)
 	defer terraform.Destroy(t, terraformOptions)
 
-	RequireNodesAreReady(t, terraformOptions, privateKey)
+	RequireNodesAreReady(t, terraformOptions, privateKey, 2)
 
 	terraformOptions.Vars["workers"] = []map[string]interface{}{
 		{
@@ -125,6 +124,7 @@ func TestModuleK8s(t *testing.T) {
 			"planetary":   true,
 		},
 	}
+
 	terraformOptions.Vars["disks"] = []map[string]interface{}{
 		{
 			"name":        "mrdisk",
@@ -148,5 +148,5 @@ func TestModuleK8s(t *testing.T) {
 	_, err = terraform.ApplyE(t, terraformOptions)
 	require.NoError(t, err)
 
-	RequireNodesAreReady(t, terraformOptions, privateKey)
+	RequireNodesAreReady(t, terraformOptions, privateKey, 3)
 }

integrationtests/remoterun.go

@@ -65,7 +65,6 @@ func RemoteRun(user string, addr string, cmd string, privateKey string) (string,
 
 // GenerateSSHKeyPair creats the public and private key for the machine
 func GenerateSSHKeyPair() (string, string, error) {
-
 	rsaKey, err := rsa.GenerateKey(rand.Reader, 1024)
 	if err != nil {
 		return "", "", errors.Wrapf(err, "could not generate rsa key")

modules/k8s-module/validator/main.tf

@@ -2,6 +2,6 @@ variable "names" {
   type = list(any)
   validation {
     condition     = length(var.names) == length(distinct(var.names))
-    error_message = "Master and workers names ${var.names} must be distinct"
+    error_message = "Master and workers names must be distinct"
   }
 }

modules/k8s-module/variables.tf

@@ -30,7 +30,7 @@ variable "master" {
 
   validation {
     condition     = var.master.memory >= 1024
-    error_message = "Memory must be at least 1GB not ${var.master.memory}MB"
+    error_message = "Memory must be at least 1GB"
   }
 }
 
@@ -50,7 +50,7 @@ variable "workers" {
     condition = ([
       for w in var.workers : true if w.memory >= 1024
     ]) != length(var.workers)
-    error_message = "Memory must be at least 1GB not ${var.master.memory}MB"
+    error_message = "Memory must be at least 1GB"
   }
 }