🏃E2e delete resources #1915

wfernandes · 2019-12-17T22:11:09Z

What this PR does / why we need it:

Adds a DeleteCluster test to the e2e test framework.
It also uses that test in the CAPD e2e tests.
Includes refactors.

Created multiple commits for easier review process.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Ref #1732

test/framework/clean_up.go

test/framework/delete_cluster.go

test/infrastructure/docker/e2e/docker_test.go

chuckha

I'm inclined to agree that we shouldn't add a separate delete test but we should be testing for cleanup after every (at least for now) test. This should keep the time the test suite runs to a minimum while still exercising the delete code written here.

test/framework/clean_up.go

test/framework/delete_cluster.go

test/framework/control_plane.go

chuckha

I really like the consolidation but I want to keep the framework provider agnostic. The providers should be maintaining their provider specific code outside of this framework

test/framework/control_plane.go

chuckha

looks great!

/approve

Just need to get the tests passing

k8s-ci-robot · 2019-12-19T18:57:44Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chuckha, wfernandes

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [chuckha]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

detiber

Minor nit, otherwise lgtm

test/infrastructure/docker/e2e/docker_suite_test.go

wfernandes · 2019-12-19T23:19:59Z

/retest

detiber · 2019-12-20T13:53:22Z

lgtm, but should probably squash some of these commits before we merge.

test/framework/control_plane.go

test/framework/go.mod

vincepri · 2019-12-20T14:46:41Z

test/framework/go.mod

 	sigs.k8s.io/cluster-api v0.2.6-0.20191216153338-db9baf9ade0c
 	sigs.k8s.io/controller-runtime v0.4.0
 )
+
+replace (
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90


What replaces this directive? Kind?

TBH I'm not sure I understand the question. I added the replace directive to match the version in cluster-api and test/infrastructure/docker.

test/framework/go.mod

test/infrastructure/docker/e2e/docker_suite_test.go

test/infrastructure/docker/e2e/docker_test.go

test/infrastructure/docker/go.mod

Signed-off-by: Warren Fernandes <[email protected]>

Update ginkgo/gomega dependencies Remove usage of OneNodeClusterInput Bump test/e2e module to go 1.13 Refactor MultiNodeControlplaneClusterInput Refactor CleanUp to assert artifacts are deleted Signed-off-by: Warren Fernandes <[email protected]>

Signed-off-by: Warren Fernandes <[email protected]>

wfernandes · 2019-12-20T23:02:53Z

@detiber I squashed some of the commits to reduce noise but still keep the independent ones separate. Let me know if this looks good or if you'd like me to squash em all the way down to one.

test/e2e/go.mod

chuckha · 2019-12-23T18:21:54Z

Thanks for addressing the major concerns. I'm fine merging this and refactoring anything that isn't working out.

/assign @detiber

for final lgtm. I believe the policy is "one PR for a big change but many commits is fine". please correct me if I've misunderstood

detiber · 2019-12-23T18:28:44Z

lgtm, however it looks like the verify job is failing

wfernandes · 2019-12-23T18:32:18Z

Yup...when I run make modules on my machine, it updates a bunch of the go.mod deps. I'm looking into this. My bad.

Signed-off-by: Warren Fernandes <[email protected]>

detiber · 2019-12-23T18:43:09Z

/lgtm

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 17, 2019

k8s-ci-robot requested review from ncdc and vincepri December 17, 2019 22:11

wfernandes force-pushed the e2e-delete-resources branch from df1bb00 to 8d2ad78 Compare December 17, 2019 22:25

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 17, 2019

detiber reviewed Dec 18, 2019

View reviewed changes

test/framework/clean_up.go Outdated Show resolved Hide resolved

test/framework/clean_up.go Outdated Show resolved Hide resolved

test/framework/delete_cluster.go Outdated Show resolved Hide resolved

test/infrastructure/docker/e2e/docker_test.go Outdated Show resolved Hide resolved

chuckha reviewed Dec 18, 2019

View reviewed changes

test/framework/clean_up.go Outdated Show resolved Hide resolved

test/framework/delete_cluster.go Outdated Show resolved Hide resolved

wfernandes force-pushed the e2e-delete-resources branch from 8d2ad78 to 57add85 Compare December 18, 2019 22:34

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 18, 2019

vincepri removed request for ncdc and vincepri December 18, 2019 22:46

wfernandes commented Dec 18, 2019

View reviewed changes

test/framework/control_plane.go Outdated Show resolved Hide resolved

chuckha suggested changes Dec 19, 2019

View reviewed changes

test/framework/control_plane.go Outdated Show resolved Hide resolved

test/framework/control_plane.go Outdated Show resolved Hide resolved

test/framework/control_plane.go Outdated Show resolved Hide resolved

chuckha mentioned this pull request Dec 19, 2019

Tracking issue for e2e testing framework and implementation #1732

Closed

23 tasks

chuckha approved these changes Dec 19, 2019

View reviewed changes

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 19, 2019

detiber reviewed Dec 19, 2019

View reviewed changes

test/infrastructure/docker/e2e/docker_suite_test.go Outdated Show resolved Hide resolved

wfernandes force-pushed the e2e-delete-resources branch from 174c554 to e6c8186 Compare December 19, 2019 22:49

vincepri reviewed Dec 20, 2019

View reviewed changes

Warren Fernandes added 5 commits December 20, 2019 13:51

Add DeleteCluster test to e2e framework

c71f7ee

Signed-off-by: Warren Fernandes <[email protected]>

Generate random kind cluster name for docker e2e

386bc95

Signed-off-by: Warren Fernandes <[email protected]>

Add docker e2e test for cluster deletion

3efd98f

Update ginkgo/gomega dependencies Remove usage of OneNodeClusterInput Bump test/e2e module to go 1.13 Refactor MultiNodeControlplaneClusterInput Refactor CleanUp to assert artifacts are deleted Signed-off-by: Warren Fernandes <[email protected]>

Use To(Succeed()) for asserting func calls

1a1bdea

Signed-off-by: Warren Fernandes <[email protected]>

Use pointer receiver for ControlPlaneCluster

9d72db7

Signed-off-by: Warren Fernandes <[email protected]>

Assert provider artifacts deleted in provider e2e tests

42a5f42

Signed-off-by: Warren Fernandes <[email protected]>

wfernandes force-pushed the e2e-delete-resources branch 3 times, most recently from 315cc44 to 97725fa Compare December 20, 2019 22:31

chuckha reviewed Dec 23, 2019

View reviewed changes

test/e2e/go.mod Outdated Show resolved Hide resolved

wfernandes force-pushed the e2e-delete-resources branch 3 times, most recently from 0d7f075 to 25441a7 Compare December 23, 2019 18:14

k8s-ci-robot assigned detiber Dec 23, 2019

Refactor for minor changes based on feedback.

65df9d9

Signed-off-by: Warren Fernandes <[email protected]>

wfernandes force-pushed the e2e-delete-resources branch from 25441a7 to 65df9d9 Compare December 23, 2019 18:40

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 23, 2019

k8s-ci-robot merged commit 98e2b5a into kubernetes-sigs:master Dec 23, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🏃E2e delete resources #1915

🏃E2e delete resources #1915

wfernandes commented Dec 17, 2019

chuckha left a comment

chuckha left a comment

chuckha left a comment

k8s-ci-robot commented Dec 19, 2019

detiber left a comment

wfernandes commented Dec 19, 2019

detiber commented Dec 20, 2019

vincepri Dec 20, 2019

wfernandes Dec 20, 2019

wfernandes commented Dec 20, 2019

chuckha commented Dec 23, 2019

detiber commented Dec 23, 2019

wfernandes commented Dec 23, 2019

detiber commented Dec 23, 2019

🏃E2e delete resources #1915

🏃E2e delete resources #1915

Conversation

wfernandes commented Dec 17, 2019

chuckha left a comment

Choose a reason for hiding this comment

chuckha left a comment

Choose a reason for hiding this comment

chuckha left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Dec 19, 2019

detiber left a comment

Choose a reason for hiding this comment

wfernandes commented Dec 19, 2019

detiber commented Dec 20, 2019

vincepri Dec 20, 2019

Choose a reason for hiding this comment

wfernandes Dec 20, 2019

Choose a reason for hiding this comment

wfernandes commented Dec 20, 2019

chuckha commented Dec 23, 2019

detiber commented Dec 23, 2019

wfernandes commented Dec 23, 2019

detiber commented Dec 23, 2019