Merge pull request #7277 from danfengliu/add-disable-informer-cache-p…

…aram Add test for disable informer cache param of velero installation
vmware-tanzu · Jan 5, 2024 · c2177c2 · c2177c2
2 parents 3401db4 + fdca488
commit c2177c2
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 4 deletions.
diff --git a/test/e2e/Makefile b/test/e2e/Makefile
@@ -104,6 +104,7 @@ UPLOADER_TYPE ?=
 
 SNAPSHOT_MOVE_DATA ?= false
 DATA_MOVER_PLUGIN ?=
+DISABLE_INFORMER_CACHE ?= false
 
 
 .PHONY:ginkgo
@@ -155,7 +156,9 @@ run: ginkgo
 		-standby-cluster-cloud-provider=$(STANDBY_CLUSTER_CLOUD_PROVIDER) \
 		-standby-cluster-plugins=$(STANDBY_CLUSTER_PLUGINS) \
 		-standby-cluster-object-store-provider=$(STANDBY_CLUSTER_OBJECT_STORE_PROVIDER) \
-		-debug-velero-pod-restart=$(DEBUG_VELERO_POD_RESTART)
+		-debug-velero-pod-restart=$(DEBUG_VELERO_POD_RESTART) \
+		-disable-informer-cache=$(DISABLE_INFORMER_CACHE)
+
 
 build: ginkgo
 	mkdir -p $(OUTPUT_DIR)

diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
@@ -94,6 +94,7 @@ func init() {
 	flag.StringVar(&VeleroCfg.StandbyClusterPlugins, "standby-cluster-plugins", "", "plugins provider for standby cluster.")
 	flag.StringVar(&VeleroCfg.StandbyClusterOjbectStoreProvider, "standby-cluster-object-store-provider", "", "object store provider for standby cluster.")
 	flag.BoolVar(&VeleroCfg.DebugVeleroPodRestart, "debug-velero-pod-restart", false, "a switch for debugging velero pod restart.")
+	flag.BoolVar(&VeleroCfg.DisableInformerCache, "disable-informer-cache", false, "a switch for disable informer cache.")
 }
 
 var _ = Describe("[APIGroup][APIVersion] Velero tests with various CRD API group versions", APIGropuVersionsTest)

diff --git a/test/e2e/migration/migration.go b/test/e2e/migration/migration.go
@@ -165,6 +165,10 @@ func MigrationTest(useVolumeSnapshots bool, veleroCLI2Version VeleroCLI2Version)
 					OriginVeleroCfg.VeleroImage = ""
 					OriginVeleroCfg.RestoreHelperImage = ""
 					OriginVeleroCfg.Plugins = ""
+					//TODO: Remove this setting when migration path is from 1.13 to higher version
+					//TODO: or self, because version 1.12 and older versions have no this parameter.
+					OriginVeleroCfg.WithoutDisableInformerCacheParam = true
+					OriginVeleroCfg.DisableInformerCache = false
 				}
 				Expect(VeleroInstall(context.Background(), &OriginVeleroCfg, false)).To(Succeed())
 				if veleroCLI2Version.VeleroVersion != "self" {

diff --git a/test/e2e/upgrade/upgrade.go b/test/e2e/upgrade/upgrade.go
@@ -145,6 +145,10 @@ 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
+				tmpCfgForOldVeleroInstall.DisableInformerCache = false
 
 				Expect(VeleroInstall(context.Background(), &tmpCfgForOldVeleroInstall, false)).To(Succeed())
 				Expect(CheckVeleroVersion(context.Background(), tmpCfgForOldVeleroInstall.VeleroCLI,

diff --git a/test/types.go b/test/types.go
@@ -85,6 +85,8 @@ type VeleroConfig struct {
 	StandbyClusterOjbectStoreProvider string
 	DebugVeleroPodRestart             bool
 	IsUpgradeTest                     bool
+	WithoutDisableInformerCacheParam  bool
+	DisableInformerCache              bool
 }
 
 type VeleroCfgInPerf struct {

diff --git a/test/util/velero/install.go b/test/util/velero/install.go
@@ -50,9 +50,10 @@ const (
 // we provide more install options other than the standard install.InstallOptions in E2E test
 type installOptions struct {
 	*install.Options
-	RegistryCredentialFile string
-	RestoreHelperImage     string
-	VeleroServerDebugMode  bool
+	RegistryCredentialFile           string
+	RestoreHelperImage               string
+	VeleroServerDebugMode            bool
+	WithoutDisableInformerCacheParam bool
 }
 
 func VeleroInstall(ctx context.Context, veleroCfg *VeleroConfig, isStandbyCluster bool) error {
@@ -130,6 +131,7 @@ func VeleroInstall(ctx context.Context, veleroCfg *VeleroConfig, isStandbyCluste
 	veleroInstallOptions.VeleroPodCPURequest = veleroCfg.VeleroPodCPURequest
 	veleroInstallOptions.VeleroPodMemLimit = veleroCfg.VeleroPodMemLimit
 	veleroInstallOptions.VeleroPodMemRequest = veleroCfg.VeleroPodMemRequest
+	veleroInstallOptions.DisableInformerCache = veleroCfg.DisableInformerCache
 
 	err = installVeleroServer(ctx, veleroCfg.VeleroCLI, veleroCfg.CloudProvider, &installOptions{
 		Options:                veleroInstallOptions,
@@ -245,6 +247,15 @@ func installVeleroServer(ctx context.Context, cli, cloudProvider string, options
 	if len(options.Plugins) > 0 {
 		args = append(args, "--plugins", options.Plugins.String())
 	}
+
+	if !options.WithoutDisableInformerCacheParam {
+		if options.DisableInformerCache {
+			args = append(args, "--disable-informer-cache=true")
+		} else {
+			args = append(args, "--disable-informer-cache=false")
+		}
+	}
+
 	fmt.Println("Start to install Azure VolumeSnapshotClass ...")
 	if len(options.Features) > 0 {
 		args = append(args, "--features", options.Features)