Merge pull request #7296 from danfengliu/fix-nightly-informer-cache-p…

…aram-issue

Fix nightly issue of missing param WithoutDisableInformerCacheParam during Velero installation

test/e2e/migration/migration.go

@@ -168,7 +168,6 @@ func MigrationTest(useVolumeSnapshots bool, veleroCLI2Version VeleroCLI2Version)
 					//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" {

test/e2e/upgrade/upgrade.go

@@ -148,7 +148,6 @@ func BackupUpgradeRestoreTest(useVolumeSnapshots bool, veleroCLI2Version VeleroC
 				//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,

test/util/velero/install.go

@@ -134,10 +134,11 @@ func VeleroInstall(ctx context.Context, veleroCfg *VeleroConfig, isStandbyCluste
 	veleroInstallOptions.DisableInformerCache = veleroCfg.DisableInformerCache
 
 	err = installVeleroServer(ctx, veleroCfg.VeleroCLI, veleroCfg.CloudProvider, &installOptions{
-		Options:                veleroInstallOptions,
-		RegistryCredentialFile: veleroCfg.RegistryCredentialFile,
-		RestoreHelperImage:     veleroCfg.RestoreHelperImage,
-		VeleroServerDebugMode:  veleroCfg.VeleroServerDebugMode,
+		Options:                          veleroInstallOptions,
+		RegistryCredentialFile:           veleroCfg.RegistryCredentialFile,
+		RestoreHelperImage:               veleroCfg.RestoreHelperImage,
+		VeleroServerDebugMode:            veleroCfg.VeleroServerDebugMode,
+		WithoutDisableInformerCacheParam: veleroCfg.WithoutDisableInformerCacheParam,
 	})
 
 	if err != nil {