Skip to content

Commit e4bdc03

Browse files
committed
update RequiredNodesAreReady to get nodesNumber as argument
1 parent a7dceed commit e4bdc03

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

integrationtests/k8s_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
)
1313

1414
// RequireNodesAreReady runs `kubectl get node` on the master node and requires that all nodes are ready
15-
func RequireNodesAreReady(t *testing.T, terraformOptions *terraform.Options, privateKey string) {
15+
func RequireNodesAreReady(t *testing.T, terraformOptions *terraform.Options, privateKey string, nodesNumber int) {
1616
t.Helper()
1717

1818
masterYggIP := terraform.Output(t, terraformOptions, "mr_ygg_ip")
@@ -24,7 +24,6 @@ func RequireNodesAreReady(t *testing.T, terraformOptions *terraform.Options, pri
2424
output = strings.TrimSpace(output)
2525
require.NoError(t, err)
2626

27-
nodesNumber := 2
2827
numberOfReadyNodes := strings.Count(output, "Ready")
2928
fmt.Println(output)
3029
require.True(t, numberOfReadyNodes == nodesNumber, "number of ready nodes is not equal to number of nodes only %d nodes are ready", numberOfReadyNodes)
@@ -84,7 +83,7 @@ func TestK8s(t *testing.T) {
8483
require.True(t, ok)
8584

8685
// ssh to master node
87-
RequireNodesAreReady(t, terraformOptions, privateKey)
86+
RequireNodesAreReady(t, terraformOptions, privateKey, 2)
8887
})
8988

9089
t.Run("k8s_invalid_names", func(t *testing.T) {

integrationtests/k8s_using_module_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ func TestModuleK8s(t *testing.T) {
4141
FreeMRU: &freeMRU,
4242
FreeSRU: &freeSRU,
4343
TotalCRU: &freeCRU,
44+
FarmIDs: []uint64{1},
4445
}
4546

4647
nodes, err := deployer.FilterNodes(context.Background(), tfPlugin, f, []uint64{freeSRU}, []uint64{}, []uint64{})
@@ -101,7 +102,7 @@ func TestModuleK8s(t *testing.T) {
101102
require.NoError(t, err)
102103
defer terraform.Destroy(t, terraformOptions)
103104

104-
RequireNodesAreReady(t, terraformOptions, privateKey)
105+
RequireNodesAreReady(t, terraformOptions, privateKey, 2)
105106

106107
terraformOptions.Vars["workers"] = []map[string]interface{}{
107108
{
@@ -149,5 +150,5 @@ func TestModuleK8s(t *testing.T) {
149150
_, err = terraform.ApplyE(t, terraformOptions)
150151
require.NoError(t, err)
151152

152-
RequireNodesAreReady(t, terraformOptions, privateKey)
153+
RequireNodesAreReady(t, terraformOptions, privateKey, 3)
153154
}

0 commit comments

Comments
 (0)