Skip to content

Commit

Permalink
update LKE test fixtures to use k8s_version
Browse files Browse the repository at this point in the history
  • Loading branch information
0xch4z committed Apr 29, 2020
1 parent 57d7ed1 commit 0d7b7b1
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 19 deletions.
6 changes: 3 additions & 3 deletions test/integration/fixtures/TestGetLKEClusterKubeconfig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: 1
interactions:
- request:
body: '{"node_pools":[{"count":1,"type":"g6-standard-2"}],"label":"02q3ns6i40tz-linodego-testing","region":"us-central","version":"1.16","tags":["testing"]}'
body: '{"node_pools":[{"count":1,"type":"g6-standard-2"}],"label":"02q3ns6i40tz-linodego-testing","region":"us-central","k8s_version":"1.16","tags":["testing"]}'
form: {}
headers:
Accept:
Expand All @@ -16,7 +16,7 @@ interactions:
response:
body: '{"id": 892, "status": "ready", "created": "2018-01-02T03:04:05", "updated":
"2018-01-02T03:04:05", "label": "02q3ns6i40tz-linodego-testing", "region": "us-central",
"version": "1.16", "tags": []}'
"k8s_version": "1.16", "tags": []}'
headers:
Access-Control-Allow-Credentials:
- "true"
Expand Down Expand Up @@ -85,7 +85,7 @@ interactions:
response:
body: '{"id": 892, "status": "ready", "created": "2018-01-02T03:04:05", "updated":
"2018-01-02T03:04:05", "label": "02q3ns6i40tz-linodego-testing", "region": "us-central",
"version": "1.16", "tags": []}'
"k8s_version": "1.16", "tags": []}'
headers:
Access-Control-Allow-Credentials:
- "true"
Expand Down
4 changes: 2 additions & 2 deletions test/integration/fixtures/TestGetLKEClusterPool_found.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: 1
interactions:
- request:
body: '{"node_pools":[{"count":1,"type":"g6-standard-2"}],"label":"a83ef3go2h76-linodego-testing","region":"us-central","version":"1.16","tags":["testing"]}'
body: '{"node_pools":[{"count":1,"type":"g6-standard-2"}],"label":"a83ef3go2h76-linodego-testing","region":"us-central","k8s_version":"1.16","tags":["testing"]}'
form: {}
headers:
Accept:
Expand All @@ -16,7 +16,7 @@ interactions:
response:
body: '{"id": 888, "status": "ready", "created": "2018-01-02T03:04:05", "updated":
"2018-01-02T03:04:05", "label": "a83ef3go2h76-linodego-testing", "region": "us-central",
"version": "1.16", "tags": []}'
"k8s_version": "1.16", "tags": []}'
headers:
Access-Control-Allow-Credentials:
- "true"
Expand Down
6 changes: 3 additions & 3 deletions test/integration/fixtures/TestGetLKECluster_found.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: 1
interactions:
- request:
body: '{"node_pools":[{"count":1,"type":"g6-standard-2"}],"label":"9a6i7ack382y-linodego-testing","region":"us-central","version":"1.16","tags":["testing"]}'
body: '{"node_pools":[{"count":1,"type":"g6-standard-2"}],"label":"9a6i7ack382y-linodego-testing","region":"us-central","k8s_version":"1.16","tags":["testing"]}'
form: {}
headers:
Accept:
Expand All @@ -16,7 +16,7 @@ interactions:
response:
body: '{"id": 890, "status": "ready", "created": "2018-01-02T03:04:05", "updated":
"2018-01-02T03:04:05", "label": "9a6i7ack382y-linodego-testing", "region": "us-central",
"version": "1.16", "tags": []}'
"k8s_version": "1.16", "tags": []}'
headers:
Access-Control-Allow-Credentials:
- "true"
Expand Down Expand Up @@ -85,7 +85,7 @@ interactions:
response:
body: '{"id": 890, "status": "ready", "created": "2018-01-02T03:04:05", "updated":
"2018-01-02T03:04:05", "label": "9a6i7ack382y-linodego-testing", "region": "us-central",
"version": "1.16", "tags": []}'
"k8s_version": "1.16", "tags": []}'
headers:
Access-Control-Allow-Credentials:
- "true"
Expand Down
6 changes: 3 additions & 3 deletions test/integration/fixtures/TestListLKEClusterAPIEndpoints.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: 1
interactions:
- request:
body: '{"node_pools":[{"count":1,"type":"g6-standard-2"}],"label":"1ry04ss8s3t8-linodego-testing","region":"us-central","version":"1.16","tags":["testing"]}'
body: '{"node_pools":[{"count":1,"type":"g6-standard-2"}],"label":"1ry04ss8s3t8-linodego-testing","region":"us-central","k8s_version":"1.16","tags":["testing"]}'
form: {}
headers:
Accept:
Expand All @@ -16,7 +16,7 @@ interactions:
response:
body: '{"id": 891, "status": "ready", "created": "2018-01-02T03:04:05", "updated":
"2018-01-02T03:04:05", "label": "1ry04ss8s3t8-linodego-testing", "region": "us-central",
"version": "1.16", "tags": []}'
"k8s_version": "1.16", "tags": []}'
headers:
Access-Control-Allow-Credentials:
- "true"
Expand Down Expand Up @@ -85,7 +85,7 @@ interactions:
response:
body: '{"id": 891, "status": "ready", "created": "2018-01-02T03:04:05", "updated":
"2018-01-02T03:04:05", "label": "1ry04ss8s3t8-linodego-testing", "region": "us-central",
"version": "1.16", "tags": []}'
"k8s_version": "1.16", "tags": []}'
headers:
Access-Control-Allow-Credentials:
- "true"
Expand Down
4 changes: 2 additions & 2 deletions test/integration/fixtures/TestListLKEClusterPools.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: 1
interactions:
- request:
body: '{"node_pools":[{"count":1,"type":"g6-standard-2"}],"label":"297ddm7e42xb-linodego-testing","region":"us-central","version":"1.16","tags":["testing"]}'
body: '{"node_pools":[{"count":1,"type":"g6-standard-2"}],"label":"297ddm7e42xb-linodego-testing","region":"us-central","k8s_version":"1.16","tags":["testing"]}'
form: {}
headers:
Accept:
Expand All @@ -16,7 +16,7 @@ interactions:
response:
body: '{"id": 889, "status": "ready", "created": "2018-01-02T03:04:05", "updated":
"2018-01-02T03:04:05", "label": "297ddm7e42xb-linodego-testing", "region": "us-central",
"version": "1.16", "tags": []}'
"k8s_version": "1.16", "tags": []}'
headers:
Access-Control-Allow-Credentials:
- "true"
Expand Down
8 changes: 4 additions & 4 deletions test/integration/fixtures/TestListLKEClusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: 1
interactions:
- request:
body: '{"node_pools":[{"count":1,"type":"g6-standard-2"}],"label":"dj7861ur2d2m-linodego-testing","region":"us-central","version":"1.16","tags":["testing"]}'
body: '{"node_pools":[{"count":1,"type":"g6-standard-2"}],"label":"dj7861ur2d2m-linodego-testing","region":"us-central","k8s_version":"1.16","tags":["testing"]}'
form: {}
headers:
Accept:
Expand All @@ -16,7 +16,7 @@ interactions:
response:
body: '{"id": 893, "status": "ready", "created": "2018-01-02T03:04:05", "updated":
"2018-01-02T03:04:05", "label": "dj7861ur2d2m-linodego-testing", "region": "us-central",
"version": "1.16", "tags": []}'
"k8s_version": "1.16", "tags": []}'
headers:
Access-Control-Allow-Credentials:
- "true"
Expand Down Expand Up @@ -84,10 +84,10 @@ interactions:
method: GET
response:
body: '{"data": [{"id": 102, "status": "ready", "created": "2018-01-02T03:04:05",
"updated": "2018-01-02T03:04:05", "label": "lke", "region": "us-central", "version":
"updated": "2018-01-02T03:04:05", "label": "lke", "region": "us-central", "k8s_version":
"1.16", "tags": []}, {"id": 893, "status": "ready", "created": "2018-01-02T03:04:05",
"updated": "2018-01-02T03:04:05", "label": "dj7861ur2d2m-linodego-testing",
"region": "us-central", "version": "1.16", "tags": []}], "page": 1, "pages":
"region": "us-central", "k8s_version": "1.16", "tags": []}], "page": 1, "pages":
1, "results": 2}'
headers:
Access-Control-Allow-Credentials:
Expand Down
3 changes: 1 addition & 2 deletions test/integration/lke_clusters_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var (
testLKEClusterCreateOpts = linodego.LKEClusterCreateOptions{
Label: label,
Region: "us-central",
K8sVersion: "1.16",
K8sVersion: "1.17",
Tags: []string{"testing"},
NodePools: []linodego.LKEClusterPoolCreateOptions{{Count: 1, Type: "g6-standard-2"}},
}
Expand Down Expand Up @@ -177,7 +177,6 @@ func setupLKECluster(t *testing.T, clusterModifiers []clusterModifier, fixturesY
var fixtureTeardown func()
client, fixtureTeardown := createTestClient(t, fixturesYaml)
createOpts := testLKEClusterCreateOpts
createOpts.K8sVersion = "1.17"
for _, modifier := range clusterModifiers {
modifier(&createOpts)
}
Expand Down

0 comments on commit 0d7b7b1

Please sign in to comment.