Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make the E2E supporting VKS data mover environment. #8371

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

blackpiglet
Copy link
Contributor

@blackpiglet blackpiglet commented Nov 5, 2024

  • Add new flag DISABLE_VSPHERE_PLUGIN for E2E test.
  • Modify the E2E README for the new parameter.
  • Add the VolumeSnapshotClass for VKS.
  • Modify the plugin install logic.
  • Modify the E2E to support data mover cases in VKS.

Thank you for contributing to Velero!

Please add a summary of your change

Does your change fix a particular issue?

Fixes #(issue)

Please indicate you've done the following:

@blackpiglet blackpiglet added kind/changelog-not-required PR does not require a user changelog. Often for docs, website, or build changes and removed has-e2e-2tests labels Nov 5, 2024
Copy link

codecov bot commented Nov 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 58.93%. Comparing base (db470a7) to head (f9d421e).
Report is 18 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #8371      +/-   ##
==========================================
- Coverage   58.95%   58.93%   -0.03%     
==========================================
  Files         367      367              
  Lines       38876    38902      +26     
==========================================
+ Hits        22920    22925       +5     
- Misses      14493    14514      +21     
  Partials     1463     1463              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@blackpiglet blackpiglet changed the title Make the Migration labels E2E test support VKS data mover environment. Make the Migration labelled E2E test support VKS data mover environment. Nov 6, 2024
@blackpiglet blackpiglet changed the title Make the Migration labelled E2E test support VKS data mover environment. Make the E2E supporting VKS data mover environment. Nov 6, 2024
@blackpiglet blackpiglet marked this pull request as draft November 6, 2024 10:35
test/types.go Outdated
@@ -118,6 +118,7 @@ type VeleroConfig struct {
ServiceAccountNameToInstall string
EKSPolicyARN string
FailFast bool
DisableVspherePlugin bool
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change it to "HasVSpherePlugin"? And following "if" will only need to check this single flag.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree that using the positive wording is more intuitive, but we cannot replace all the provider checking with this flag, for example:

						// If the CloudProvider is vSphere and don't need vSphere plugin,
						// Only install the AWS plugin.
						// If do nothing here, the default behavior is
						// installing both AWS and vSphere plugins.
						if OriginVeleroCfg.CloudProvider == Vsphere &&
							OriginVeleroCfg.DisableVspherePlugin {
							OriginVeleroCfg.Plugins = migrationNeedPlugins[AWS][0]
						}

It should be changed to something like the following.
The HasVspherePlugin flag is defaulted to false, so we need to check the provider to make sure it's for vSphere environment.

						// If HasVspherePlugin is false, only install the AWS plugin.
						// If do nothing here, the default behavior is
						// installing both AWS and vSphere plugins.
						if OriginVeleroCfg.CloudProvider == Vsphere &&
							!OriginVeleroCfg.HasVspherePlugin {
							OriginVeleroCfg.Plugins = migrationNeedPlugins[AWS][0]
						}

@blackpiglet blackpiglet force-pushed the migration_case_support_vks branch 3 times, most recently from e62b50b to 8533394 Compare November 12, 2024 07:47
* Add new flag HAS_VSPHERE_PLUGIN for E2E test.
* Modify the E2E README for the new parameter.
* Add the VolumeSnapshotClass for VKS.
* Modify the plugin install logic.
* Modify the cases to support data mover case in VKS.

Signed-off-by: Xun Jiang <xun.jiang@broadcom.com>
Signed-off-by: Xun Jiang <xun.jiang@broadcom.com>
@blackpiglet blackpiglet force-pushed the migration_case_support_vks branch 4 times, most recently from 3bdbc0d to dd27aa4 Compare November 13, 2024 10:46
Signed-off-by: Xun Jiang <xun.jiang@broadcom.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
has-e2e-2tests kind/changelog-not-required PR does not require a user changelog. Often for docs, website, or build changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants