✨ Clean up pkg/internal/testing #1540
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
the
cncf-cla: yes
k8s-ci-robot
added
approved
This was referenced May 25, 2021
This moves testing/integration/internal into several more specific packages to prepare to refactor the rest and dedup with the main envtest code.
This moves control plane components to a new internal/testing/controlplane directory, unifying the first and second levels of internal packages.
This removes some legacy cruft from the process abstraction, namely: - the legacy health check support (startup message), since our supported etcd versions support the /health endpoint - URL populatation, since we end up needing multiple ports for the api server - gexec usage, since we don't need to check wait messages any more and the equivalent "send SIGTERM" and "wait for process to exit" parts are pretty straightforward for our usecases.
This only contained integration tests, which will be re-introduced in a cleaned up form shortly.
DirectXMan12
force-pushed
the
refactor/shuffle-internal-testing
branch
from
78a2f9f
to
b884743
Compare
This updates envtests, etc to use to the new refactored internal/testing/xyz paths (certs, addr, controlplane).
DirectXMan12
force-pushed
the
refactor/shuffle-internal-testing
branch
from
b884743
to
294af4f
Compare
vincepri
reviewed
May 25, 2021
Comment on lines
67
to
71
| if e.processState == nil { | ||
| if err := e.setProcessState(); err != nil { | ||
| if err := e.setState(); err != nil { | ||
| return err | ||
| } | ||
| } |
There was a problem hiding this comment.
Is there any reason why we need to protect this?
Could we put everything inside a sync.Once?
There was a problem hiding this comment.
ditto here -- focusing on not changing functionality in this PR
|
this PR is supposed to generally not change behavior from what happened previously -- just refactor or prune a couple of blatantly unused things. |
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: DirectXMan12, vincepri 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:
Approvers can indicate their approval by writing |
|
/retest |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This cleans up
pkg/internal/testing, hosting a series of nested packages into a flatter hierarchy that makes more sense for its current location, and prunes some old, unused functionality.The old state matches, more-or-less directly, the structure of
sigs.k8s.io/testing_frameworks. When we took ownership of that code, we pretty much dropped it ininternal/testing. This made it easier to import, but leaves us with a complicated mess that's more difficult to refactor and understand.We also ended up with some unused functionality -- some of this was due to mismatches between how CR needed to use
testing_frameworksvs how it was written, other stuff was due to older versions of software that we no longer support (e.g. all the etcd versions we support have HTTP health check end points).This should make it easier to build on this code to add new features (e.g. support for secure serving).
Part of #1486.