Skip to content

Commit 166a6b0

Browse files
Fix LKE node pool tests (#556)
1 parent da1ac32 commit 166a6b0

7 files changed

+1027
-508
lines changed

test/integration/fixtures/TestLKENodePoolNode_Delete.yaml

+162-102
Large diffs are not rendered by default.

test/integration/fixtures/TestLKENodePool_CreateWithLabelsAndTaints.yaml

+364-82
Large diffs are not rendered by default.

test/integration/fixtures/TestLKENodePool_GetFound.yaml

+159-101
Large diffs are not rendered by default.

test/integration/fixtures/TestLKENodePool_GetMissing.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ interactions:
2222
- HEAD, GET, OPTIONS, POST, PUT, DELETE
2323
Access-Control-Allow-Origin:
2424
- '*'
25+
Akamai-Internal-Account:
26+
- '*'
2527
Cache-Control:
2628
- max-age=0, no-cache, no-store
2729
Connection:
@@ -31,7 +33,7 @@ interactions:
3133
Content-Type:
3234
- application/json
3335
Expires:
34-
- Mon, 01 Jul 2024 17:48:55 GMT
36+
- Fri, 19 Jul 2024 17:03:54 GMT
3537
Pragma:
3638
- no-cache
3739
Vary:

test/integration/fixtures/TestLKENodePool_Update.yaml

+171-111
Large diffs are not rendered by default.

test/integration/fixtures/TestLKENodePools_List.yaml

+161-103
Large diffs are not rendered by default.

test/integration/lke_node_pools_test.go

+7-8
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func TestLKENodePool_GetMissing(t *testing.T) {
3939
}
4040

4141
func TestLKENodePool_GetFound(t *testing.T) {
42-
client, lkeCluster, pool, teardown, err := setupLKENodePool(t, "fixtures/TestLKENodePool_GetFound", nil)
42+
client, lkeCluster, pool, teardown, err := setupLKENodePool(t, "fixtures/TestLKENodePool_GetFound", &testLKENodePoolCreateOpts)
4343
if err != nil {
4444
t.Error(err)
4545
}
@@ -72,7 +72,7 @@ func TestLKENodePool_GetFound(t *testing.T) {
7272
}
7373

7474
func TestLKENodePools_List(t *testing.T) {
75-
client, lkeCluster, _, teardown, err := setupLKENodePool(t, "fixtures/TestLKENodePools_List", nil)
75+
client, lkeCluster, _, teardown, err := setupLKENodePool(t, "fixtures/TestLKENodePools_List", &testLKENodePoolCreateOpts)
7676
if err != nil {
7777
t.Error(err)
7878
}
@@ -88,7 +88,7 @@ func TestLKENodePools_List(t *testing.T) {
8888
}
8989

9090
func TestLKENodePoolNode_Delete(t *testing.T) {
91-
client, lkeCluster, nodePool, teardown, err := setupLKENodePool(t, "fixtures/TestLKENodePoolNode_Delete", nil)
91+
client, lkeCluster, nodePool, teardown, err := setupLKENodePool(t, "fixtures/TestLKENodePoolNode_Delete", &testLKENodePoolCreateOpts)
9292
if err != nil {
9393
t.Error(err)
9494
}
@@ -111,7 +111,7 @@ func TestLKENodePoolNode_Delete(t *testing.T) {
111111
}
112112

113113
func TestLKENodePool_Update(t *testing.T) {
114-
client, lkeCluster, nodePool, teardown, err := setupLKENodePool(t, "fixtures/TestLKENodePool_Update", nil)
114+
client, lkeCluster, nodePool, teardown, err := setupLKENodePool(t, "fixtures/TestLKENodePool_Update", &testLKENodePoolCreateOpts)
115115
if err != nil {
116116
t.Error(err)
117117
}
@@ -188,6 +188,8 @@ func TestLKENodePool_CreateWithLabelsAndTaints(t *testing.T) {
188188
Value: "bar",
189189
Effect: linodego.LKENodePoolTaintEffectNoSchedule,
190190
}},
191+
Count: 1,
192+
Type: "g6-standard-1",
191193
}
192194
_, _, nodePool, teardown, err := setupLKENodePool(t, "fixtures/TestLKENodePool_CreateWithLabelsAndTaints", createOpts)
193195
if err != nil {
@@ -208,15 +210,12 @@ func setupLKENodePool(t *testing.T, fixturesYaml string, nodePoolCreateOpts *lin
208210
var fixtureTeardown func()
209211
client, lkeCluster, fixtureTeardown, err := setupLKECluster(t, []clusterModifier{func(createOpts *linodego.LKEClusterCreateOptions) {
210212
createOpts.Label = "go-lke-test-def"
211-
if nodePoolCreateOpts != nil {
212-
createOpts.NodePools = []linodego.LKENodePoolCreateOptions{*nodePoolCreateOpts}
213-
}
214213
}}, fixturesYaml)
215214
if err != nil {
216215
t.Errorf("Error creating lkeCluster, got error %v", err)
217216
}
218217

219-
pool, err := client.CreateLKENodePool(context.Background(), lkeCluster.ID, testLKENodePoolCreateOpts)
218+
pool, err := client.CreateLKENodePool(context.Background(), lkeCluster.ID, *nodePoolCreateOpts)
220219
if err != nil {
221220
t.Errorf("Error creating LKE Node Pool, got error %v", err)
222221
}

0 commit comments

Comments
 (0)