Improve accuracy of local control plane migration e2e tests #7981
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
gardener-prow
bot
added
area/dev-productivity
|
/assign |
plkokanov
requested changes
May 25, 2023
This way, they become reusable even when no `genericActuator` object is available Co-Authored-By: Jens Schneider <schneider@23technologies.cloud> Co-Authored-By: mreiger <michael@rauschpfeife.net>
…nction Earlier, the `genericactuator.Restore()` was restoring and always calling `Reconcile()` at the end. It is still doing this, however now the restoration logic has been separated into `RestoreWithoutReconcile`. This allows extensions to optionally perform custom operations before they call the `Reconcile()` function. Co-Authored-By: Jens Schneider <schneider@23technologies.cloud> Co-Authored-By: mreiger <michael@rauschpfeife.net>
Earlier, the `Worker` controller of `provider-local` has overwritten the `Migrate` function which caused the essential migration logic in the generic `Worker` actuator to not get executed. This limited the accuracy of the CPM e2e test since the essential logic was not executed. Similarly, `Restore` was not executing the essential logic of the generic `Worker` actuator. Now it is calling the the `RestoreWithoutReconcile()` and `Reconcile()` afterwards. In the next commit, it will perform some custom logic to allow making use of the essential CPM logic in generic `Worker` actuator. Co-Authored-By: Jens Schneider <schneider@23technologies.cloud> Co-Authored-By: mreiger <michael@rauschpfeife.net>
Co-Authored-By: Jens Schneider <schneider@23technologies.cloud> Co-Authored-By: mreiger <michael@rauschpfeife.net>
rfranzke
force-pushed
the
hackathon/local-cpm
branch
from
4c20167
to
7b92852
Compare
|
/lgtm |
|
LGTM label has been added. Git tree hash: a2dec581a0b2f891f1a927652f9f06b7775b7ec6
|
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: plkokanov 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 |
gardener-prow
bot
added
the
approved
|
/test pull-gardener-integration |
andrerun
pushed a commit
to andrerun/gardener
that referenced
this pull request
Jul 6, 2023
…#7981) * Decouple certain functions from generic `Worker` actuator This way, they become reusable even when no `genericActuator` object is available Co-Authored-By: Jens Schneider <schneider@23technologies.cloud> Co-Authored-By: mreiger <michael@rauschpfeife.net> * Move restoration logic in generic `Worker` actuator into dedicated function Earlier, the `genericactuator.Restore()` was restoring and always calling `Reconcile()` at the end. It is still doing this, however now the restoration logic has been separated into `RestoreWithoutReconcile`. This allows extensions to optionally perform custom operations before they call the `Reconcile()` function. Co-Authored-By: Jens Schneider <schneider@23technologies.cloud> Co-Authored-By: mreiger <michael@rauschpfeife.net> * [provider-local] Drop `Migrate` overwrite in `Worker` controller Earlier, the `Worker` controller of `provider-local` has overwritten the `Migrate` function which caused the essential migration logic in the generic `Worker` actuator to not get executed. This limited the accuracy of the CPM e2e test since the essential logic was not executed. Similarly, `Restore` was not executing the essential logic of the generic `Worker` actuator. Now it is calling the the `RestoreWithoutReconcile()` and `Reconcile()` afterwards. In the next commit, it will perform some custom logic to allow making use of the essential CPM logic in generic `Worker` actuator. Co-Authored-By: Jens Schneider <schneider@23technologies.cloud> Co-Authored-By: mreiger <michael@rauschpfeife.net> * [provider-local] Delete stale `Machine`s after CPM Co-Authored-By: Jens Schneider <schneider@23technologies.cloud> Co-Authored-By: mreiger <michael@rauschpfeife.net> * Address PR review feedback --------- Co-authored-by: Jens Schneider <schneider@23technologies.cloud> Co-authored-by: mreiger <michael@rauschpfeife.net>
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.
How to categorize this PR?
/area dev-productivity
/kind enhancement
What this PR does / why we need it:
When performing control plane migration with
provider-local, the full migration and restoration logic implemented in the extensions library (genericWorkeractuator) is now executed (previously, it was skipped). This improves the accuracy of the e2e tests for control plane migration.Which issue(s) this PR fixes:
Introduced with #6059
Special notes for your reviewer:
/cc @plkokanov
Release note:
When performing control plane migration with `provider-local`, the full migration and restoration logic implemented in the extensions library (generic `Worker` actuator) is now executed (previously, it was skipped). This improves the accuracy of the e2e tests for control plane migration.