mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-08 06:15:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix nightly issue of missing param WithoutDisableInformerCacheParam during Velero installation

Browse Source 
Signed-off-by: danfengl <danfengl@vmware.com>
This commit is contained in:
danfengl
2024-01-10 02:57:44 +00:00
parent e65ef28948
commit a9c820c9d6
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/migration/migration.go
View File

@@ -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" {

1
test/e2e/upgrade/upgrade.go
View File

@@ -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,

9
test/util/velero/install.go
View File

@@ -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 {