skip k8s test if no enough nodes

Author: Eslam-Nawara

integrationtests/k8s/main.tf

@@ -78,13 +78,13 @@ resource "grid_kubernetes" "k8s1" {
 }
 
 output "mr_ygg_ip" {
-  value = grid_kubernetes.k8s1.master[0]
+  value = grid_kubernetes.k8s1.master[0].planetary_ip
 }
 
 output "wg_config" {
   value = grid_network.net1.access_wg_config
 }
 
 output "worker_ygg_ip" {
-  value = grid_kubernetes.k8s1.workers[0]
+  value = grid_kubernetes.k8s1.workers[0].planetary_ip
 }

integrationtests/k8s_test.go

@@ -1,6 +1,7 @@
 package integrationtests
 
 import (
+	"fmt"
 	"strings"
 	"testing"
 	"time"
@@ -21,10 +22,11 @@ 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")
+	fmt.Println(output)
 	require.True(t, numberOfReadyNodes == nodesNumber, "number of ready nodes is not equal to number of nodes only %d nodes are ready", numberOfReadyNodes)
 }
 

integrationtests/k8s_using_module/main.tf

@@ -64,5 +64,5 @@ locals {
 }
 
 output "mr_ygg_ip" {
-  value = module.kubernetes.master
+  value = module.kubernetes.master.planetary_ip
 }

integrationtests/k8s_using_module_test.go

@@ -41,15 +41,13 @@ func TestModuleK8s(t *testing.T) {
 		FreeMRU:  &freeMRU,
 		FreeSRU:  &freeSRU,
 		TotalCRU: &freeCRU,
-		Excluded: []uint64{146, 150, 153, 151},
-		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
@@ -59,9 +57,9 @@ func TestModuleK8s(t *testing.T) {
 		TerraformDir: "./k8s_using_module",
 		Vars: map[string]interface{}{
 			"ssh":           publicKey,
-			"network_nodes": []int{masterNode},
+			"network_nodes": []int{masterNode, worker0Node, worker1Node},
 			"master": map[string]interface{}{
-				"name":        "master",
+				"name":        "mr",
 				"node":        masterNode,
 				"cpu":         1,
 				"memory":      1024,
@@ -72,7 +70,7 @@ func TestModuleK8s(t *testing.T) {
 			},
 			"workers": []map[string]interface{}{
 				{
-					"name":        "worker0",
+					"name":        "w0",
 					"node":        worker0Node,
 					"cpu":         1,
 					"memory":      1024,
@@ -127,6 +125,7 @@ func TestModuleK8s(t *testing.T) {
 			"planetary":   true,
 		},
 	}
+
 	terraformOptions.Vars["disks"] = []map[string]interface{}{
 		{
 			"name":        "mrdisk",

integrationtests/remoterun.go

@@ -1,6 +1,3 @@
-//go:build integration
-// +build integration
-
 // Package integrationtests includes integration tests for deploying solutions on the tf grid, and some utilities to test these solutions.
 package integrationtests
 
@@ -25,7 +22,7 @@ func setup() (deployer.TFPluginClient, error) {
 		network = "dev"
 	}
 
-	return deployer.NewTFPluginClient(mnemonics, deployer.WithNetwork(network), deployer.WithLogs())
+	return deployer.NewTFPluginClient(mnemonics, deployer.WithNetwork(network), deployer.WithLogs(), deployer.WithRMBTimeout(60))
 }
 
 // RemoteRun used for running cmd remotely using ssh
@@ -65,7 +62,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")