Modify upgrade and migration cases.

Signed-off-by: Xun Jiang <[email protected]>
vmware-tanzu · Nov 13, 2024 · a9ee006 · a9ee006
1 parent bcb60ed
commit a9ee006
Show file tree

Hide file tree

Showing 4 changed files with 114 additions and 80 deletions.
diff --git a/test/e2e/migration/migration.go b/test/e2e/migration/migration.go
@@ -25,7 +25,6 @@ import (
 	"github.com/google/uuid"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"golang.org/x/mod/semver"
 
 	. "github.com/vmware-tanzu/velero/test"
 	util "github.com/vmware-tanzu/velero/test/util/csi"
@@ -142,38 +141,12 @@ func MigrationTest(useVolumeSnapshots bool, veleroCLI2Version VeleroCLI2Version)
 					if veleroCLI2Version.VeleroVersion == "self" {
 						veleroCLI2Version.VeleroCLI = veleroCfg.VeleroCLI
 					} else {
-						fmt.Printf("Using default images address of Velero CLI %s\n", veleroCLI2Version.VeleroVersion)
-						OriginVeleroCfg.VeleroImage = ""
-						OriginVeleroCfg.RestoreHelperImage = ""
-						OriginVeleroCfg.Plugins = ""
-
-						versionWithoutPatch := semver.MajorMinor(veleroCLI2Version.VeleroVersion)
-						// Read migration case needs plugins from the PluginsMatrix map.
-						migrationNeedPlugins, ok := PluginsMatrix[versionWithoutPatch]
-						Expect(ok).To(BeTrue())
-
-						if OriginVeleroCfg.CloudProvider == Azure {
-							OriginVeleroCfg.Plugins = migrationNeedPlugins[Azure][0]
-						}
-						if OriginVeleroCfg.CloudProvider == AWS {
-							OriginVeleroCfg.Plugins = migrationNeedPlugins[AWS][0]
-						}
-						// 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]
-						}
-						// Because Velero CSI plugin is deprecated in v1.14,
-						// only need to install it for version lower than v1.14.
-						if strings.Contains(OriginVeleroCfg.Features, FeatureCSI) &&
-							semver.Compare(versionWithoutPatch, "v1.14") < 0 {
-							OriginVeleroCfg.Plugins = OriginVeleroCfg.Plugins + "," + migrationNeedPlugins[CSI][0]
-						}
-						if OriginVeleroCfg.SnapshotMoveData && OriginVeleroCfg.CloudProvider == Azure {
-							OriginVeleroCfg.Plugins = OriginVeleroCfg.Plugins + "," + migrationNeedPlugins[AWS][0]
-						}
+						OriginVeleroCfg, err = SetImagesToDefaultValues(
+							OriginVeleroCfg,
+							veleroCLI2Version.VeleroVersion,
+						)
+						Expect(err).To(Succeed(), "Fail to set images for the migrate-from Velero installation.")
+
 						veleroCLI2Version.VeleroCLI, err = InstallVeleroCLI(veleroCLI2Version.VeleroVersion)
 						Expect(err).To(Succeed())
 					}

diff --git a/test/e2e/upgrade/upgrade.go b/test/e2e/upgrade/upgrade.go
@@ -124,14 +124,16 @@ func BackupUpgradeRestoreTest(useVolumeSnapshots bool, veleroCLI2Version VeleroC
 			veleroCfg.GCFrequency = ""
 			By(fmt.Sprintf("Install the expected old version Velero (%s) for upgrade",
 				veleroCLI2Version.VeleroVersion), func() {
-				//Set VeleroImage and RestoreHelperImage to blank
-				//VeleroImage and RestoreHelperImage should be the default value in originalCli
 				tmpCfgForOldVeleroInstall := veleroCfg
 				tmpCfgForOldVeleroInstall.UpgradeFromVeleroVersion = veleroCLI2Version.VeleroVersion
 				tmpCfgForOldVeleroInstall.VeleroCLI = veleroCLI2Version.VeleroCLI
-				tmpCfgForOldVeleroInstall.VeleroImage = ""
-				tmpCfgForOldVeleroInstall.RestoreHelperImage = ""
-				tmpCfgForOldVeleroInstall.Plugins = ""
+
+				tmpCfgForOldVeleroInstall, err = SetImagesToDefaultValues(
+					tmpCfgForOldVeleroInstall,
+					veleroCLI2Version.VeleroVersion,
+				)
+				Expect(err).To(Succeed(), "Fail to set the images for upgrade-from Velero installation.")
+
 				tmpCfgForOldVeleroInstall.UploaderType = ""
 				version, err := GetVeleroVersion(oneHourTimeout, tmpCfgForOldVeleroInstall.VeleroCLI, true)
 				Expect(err).To(Succeed(), "Fail to get Velero version")
@@ -145,9 +147,6 @@ func BackupUpgradeRestoreTest(useVolumeSnapshots bool, veleroCLI2Version VeleroC
 					tmpCfgForOldVeleroInstall.UseRestic = !useVolumeSnapshots
 					tmpCfgForOldVeleroInstall.UseNodeAgent = false
 				}
-				//TODO: Remove this setting when upgrade path is from 1.13 to higher
-				//TODO: version, or self version 1.12 and older versions have no this parameter.
-				tmpCfgForOldVeleroInstall.WithoutDisableInformerCacheParam = true
 
 				Expect(VeleroInstall(context.Background(), &tmpCfgForOldVeleroInstall, false)).To(Succeed())
 				Expect(CheckVeleroVersion(context.Background(), tmpCfgForOldVeleroInstall.VeleroCLI,

diff --git a/test/types.go b/test/types.go
@@ -38,6 +38,8 @@ const AWS = "aws"
 const GCP = "gcp"
 const Vsphere = "vsphere"
 const CSI = "csi"
+const Velero = "velero"
+const VeleroRestoreHelper = "velero-restore-helper"
 
 const UploaderTypeRestic = "restic"
 

diff --git a/test/util/velero/velero_utils.go b/test/util/velero/velero_utils.go
@@ -36,6 +36,7 @@ import (
 
 	"github.com/pkg/errors"
 	"golang.org/x/exp/slices"
+	"golang.org/x/mod/semver"
 	ver "k8s.io/apimachinery/pkg/util/version"
 	"k8s.io/apimachinery/pkg/util/wait"
 	kbclient "sigs.k8s.io/controller-runtime/pkg/client"
@@ -54,67 +55,126 @@ const BackupObjectsPrefix = "backups"
 const RestoreObjectsPrefix = "restores"
 const PluginsObjectsPrefix = "plugins"
 
-var PluginsMatrix = map[string]map[string][]string{
+var ImagesMatrix = map[string]map[string][]string{
 	"v1.10": {
-		"aws":     {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.6.0"},
-		"azure":   {"gcr.io/velero-gcp/velero-plugin-for-microsoft-azure:v1.6.0"},
-		"vsphere": {"gcr.io/velero-gcp/velero-plugin-for-vsphere:v1.5.1"},
-		"gcp":     {"gcr.io/velero-gcp/velero-plugin-for-gcp:v1.6.0"},
-		"csi":     {"gcr.io/velero-gcp/velero-plugin-for-csi:v0.4.0"},
+		"aws":                   {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.6.0"},
+		"azure":                 {"gcr.io/velero-gcp/velero-plugin-for-microsoft-azure:v1.6.0"},
+		"vsphere":               {"gcr.io/velero-gcp/velero-plugin-for-vsphere:v1.5.1"},
+		"gcp":                   {"gcr.io/velero-gcp/velero-plugin-for-gcp:v1.6.0"},
+		"csi":                   {"gcr.io/velero-gcp/velero-plugin-for-csi:v0.4.0"},
+		"velero":                {"gcr.io/velero-gcp/velero:v1.10.2"},
+		"velero-restore-helper": {"gcr.io/velero-gcp/velero-restore-helper:v1.10.2"},
 	},
 	"v1.11": {
-		"aws":     {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.7.0"},
-		"azure":   {"gcr.io/velero-gcp/velero-plugin-for-microsoft-azure:v1.7.0"},
-		"vsphere": {"gcr.io/velero-gcp/velero-plugin-for-vsphere:v1.5.1"},
-		"gcp":     {"gcr.io/velero-gcp/velero-plugin-for-gcp:v1.7.0"},
-		"csi":     {"gcr.io/velero-gcp/velero-plugin-for-csi:v0.5.0"},
+		"aws":                   {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.7.0"},
+		"azure":                 {"gcr.io/velero-gcp/velero-plugin-for-microsoft-azure:v1.7.0"},
+		"vsphere":               {"gcr.io/velero-gcp/velero-plugin-for-vsphere:v1.5.1"},
+		"gcp":                   {"gcr.io/velero-gcp/velero-plugin-for-gcp:v1.7.0"},
+		"csi":                   {"gcr.io/velero-gcp/velero-plugin-for-csi:v0.5.0"},
+		"velero":                {"gcr.io/velero-gcp/velero:v1.11.1"},
+		"velero-restore-helper": {"gcr.io/velero-gcp/velero-restore-helper:v1.11.1"},
 	},
 	"v1.12": {
-		"aws":     {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.8.0"},
-		"azure":   {"gcr.io/velero-gcp/velero-plugin-for-microsoft-azure:v1.8.0"},
-		"vsphere": {"gcr.io/velero-gcp/velero-plugin-for-vsphere:v1.5.1"},
-		"gcp":     {"gcr.io/velero-gcp/velero-plugin-for-gcp:v1.8.0"},
-		"csi":     {"gcr.io/velero-gcp/velero-plugin-for-csi:v0.6.0"},
+		"aws":                   {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.8.0"},
+		"azure":                 {"gcr.io/velero-gcp/velero-plugin-for-microsoft-azure:v1.8.0"},
+		"vsphere":               {"gcr.io/velero-gcp/velero-plugin-for-vsphere:v1.5.1"},
+		"gcp":                   {"gcr.io/velero-gcp/velero-plugin-for-gcp:v1.8.0"},
+		"csi":                   {"gcr.io/velero-gcp/velero-plugin-for-csi:v0.6.0"},
+		"velero":                {"gcr.io/velero-gcp/velero:v1.12.4"},
+		"velero-restore-helper": {"gcr.io/velero-gcp/velero-restore-helper:v1.12.4"},
 	},
 	"v1.13": {
-		"aws":       {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.9.2"},
-		"azure":     {"gcr.io/velero-gcp/velero-plugin-for-microsoft-azure:v1.9.2"},
-		"vsphere":   {"gcr.io/velero-gcp/velero-plugin-for-vsphere:v1.5.2"},
-		"gcp":       {"gcr.io/velero-gcp/velero-plugin-for-gcp:v1.9.2"},
-		"csi":       {"gcr.io/velero-gcp/velero-plugin-for-csi:v0.7.1"},
-		"datamover": {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.9.2"},
+		"aws":                   {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.9.2"},
+		"azure":                 {"gcr.io/velero-gcp/velero-plugin-for-microsoft-azure:v1.9.2"},
+		"vsphere":               {"gcr.io/velero-gcp/velero-plugin-for-vsphere:v1.5.2"},
+		"gcp":                   {"gcr.io/velero-gcp/velero-plugin-for-gcp:v1.9.2"},
+		"csi":                   {"gcr.io/velero-gcp/velero-plugin-for-csi:v0.7.1"},
+		"datamover":             {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.9.2"},
+		"velero":                {"gcr.io/velero-gcp/velero:v1.13.2"},
+		"velero-restore-helper": {"gcr.io/velero-gcp/velero-restore-helper:v1.13.2"},
 	},
 	"v1.14": {
-		"aws":       {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.10.1"},
-		"azure":     {"gcr.io/velero-gcp/velero-plugin-for-microsoft-azure:v1.10.1"},
-		"vsphere":   {"gcr.io/velero-gcp/velero-plugin-for-vsphere:v1.5.2"},
-		"gcp":       {"gcr.io/velero-gcp/velero-plugin-for-gcp:v1.10.1"},
-		"datamover": {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.10.1"},
+		"aws":                   {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.10.1"},
+		"azure":                 {"gcr.io/velero-gcp/velero-plugin-for-microsoft-azure:v1.10.1"},
+		"vsphere":               {"gcr.io/velero-gcp/velero-plugin-for-vsphere:v1.5.2"},
+		"gcp":                   {"gcr.io/velero-gcp/velero-plugin-for-gcp:v1.10.1"},
+		"datamover":             {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.10.1"},
+		"velero":                {"gcr.io/velero-gcp/velero:v1.14.1"},
+		"velero-restore-helper": {"gcr.io/velero-gcp/velero-restore-helper:v1.14.1"},
 	},
 	"v1.15": {
-		"aws":       {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.11.0"},
-		"azure":     {"gcr.io/velero-gcp/velero-plugin-for-microsoft-azure:v1.11.0"},
-		"vsphere":   {"gcr.io/velero-gcp/velero-plugin-for-vsphere:v1.5.2"},
-		"gcp":       {"gcr.io/velero-gcp/velero-plugin-for-gcp:v1.11.0"},
-		"datamover": {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.11.0"},
+		"aws":                   {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.11.0"},
+		"azure":                 {"gcr.io/velero-gcp/velero-plugin-for-microsoft-azure:v1.11.0"},
+		"vsphere":               {"gcr.io/velero-gcp/velero-plugin-for-vsphere:v1.5.2"},
+		"gcp":                   {"gcr.io/velero-gcp/velero-plugin-for-gcp:v1.11.0"},
+		"datamover":             {"gcr.io/velero-gcp/velero-plugin-for-aws:v1.11.0"},
+		"velero":                {"gcr.io/velero-gcp/velero:v1.15.0"},
+		"velero-restore-helper": {"gcr.io/velero-gcp/velero-restore-helper:v1.15.0"},
 	},
 	"main": {
-		"aws":       {"gcr.io/velero-gcp/velero-plugin-for-aws:main"},
-		"azure":     {"gcr.io/velero-gcp/velero-plugin-for-microsoft-azure:main"},
-		"vsphere":   {"gcr.io/velero-gcp/velero-plugin-for-vsphere:v1.5.2"},
-		"gcp":       {"gcr.io/velero-gcp/velero-plugin-for-gcp:main"},
-		"datamover": {"gcr.io/velero-gcp/velero-plugin-for-aws:main"},
+		"aws":                   {"gcr.io/velero-gcp/velero-plugin-for-aws:main"},
+		"azure":                 {"gcr.io/velero-gcp/velero-plugin-for-microsoft-azure:main"},
+		"vsphere":               {"gcr.io/velero-gcp/velero-plugin-for-vsphere:v1.5.2"},
+		"gcp":                   {"gcr.io/velero-gcp/velero-plugin-for-gcp:main"},
+		"datamover":             {"gcr.io/velero-gcp/velero-plugin-for-aws:main"},
+		"velero":                {"gcr.io/velero-gcp/velero:main"},
+		"velero-restore-helper": {"gcr.io/velero-gcp/velero-restore-helper:main"},
 	},
 }
 
+func SetImagesToDefaultValues(config VeleroConfig, version string) (VeleroConfig, error) {
+	fmt.Printf("Get the images for version %s\n", version)
+
+	ret := config
+
+	ret.Plugins = ""
+
+	versionWithoutPatch := semver.MajorMinor(version)
+	// Read migration case needs images from the PluginsMatrix map.
+	images, ok := ImagesMatrix[versionWithoutPatch]
+	if !ok {
+		return config, fmt.Errorf("fail to read the images for version %s from the ImagesMatrix",
+			versionWithoutPatch)
+	}
+
+	ret.VeleroImage = images[Velero][0]
+	ret.RestoreHelperImage = images[VeleroRestoreHelper][0]
+
+	if ret.CloudProvider == Azure {
+		ret.Plugins = images[Azure][0]
+	}
+	if ret.CloudProvider == AWS {
+		ret.Plugins = images[AWS][0]
+	}
+	// If HasVspherePlugin is false, only install the AWS plugin.
+	// If do nothing here, the default behavior is
+	// installing both AWS and vSphere plugins.
+	if ret.CloudProvider == Vsphere &&
+		!ret.HasVspherePlugin {
+		ret.Plugins = images[AWS][0]
+	}
+
+	// Because Velero CSI plugin is deprecated in v1.14,
+	// only need to install it for version lower than v1.14.
+	if strings.Contains(ret.Features, FeatureCSI) &&
+		semver.Compare(versionWithoutPatch, "v1.14") < 0 {
+		ret.Plugins = ret.Plugins + "," + images[CSI][0]
+	}
+	if ret.SnapshotMoveData && ret.CloudProvider == Azure {
+		ret.Plugins = ret.Plugins + "," + images[AWS][0]
+	}
+
+	return ret, nil
+}
+
 func getPluginsByVersion(version string, cloudProvider string, needDataMoverPlugin bool) ([]string, error) {
 	var cloudMap map[string][]string
 	arr := strings.Split(version, ".")
 	if len(arr) >= 3 {
-		cloudMap = PluginsMatrix[arr[0]+"."+arr[1]]
+		cloudMap = ImagesMatrix[arr[0]+"."+arr[1]]
 	}
 	if len(cloudMap) == 0 {
-		cloudMap = PluginsMatrix["main"]
+		cloudMap = ImagesMatrix["main"]
 		if len(cloudMap) == 0 {
 			return nil, errors.Errorf("fail to get plugins by version: main")
 		}