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

Merge branch 'main' into 1.17-readme

Browse Source
This commit is contained in:
lyndon-li
2025-08-27 14:18:27 +08:00
committed by GitHub
parent c6d611aa7f edf1f26669
commit 48cf4bf172
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/Makefile
View File

@@ -74,7 +74,7 @@ HAS_VSPHERE_PLUGIN ?= false
RESTORE_HELPER_IMAGE ?= RESTORE_HELPER_IMAGE ?=
#Released version only #Released version only
UPGRADE_FROM_VELERO_VERSION ?= v1.14.1,v1.15.2 UPGRADE_FROM_VELERO_VERSION ?= v1.15.2,v1.16.2
# UPGRADE_FROM_VELERO_CLI can has the same format(a list divided by comma) with UPGRADE_FROM_VELERO_VERSION # UPGRADE_FROM_VELERO_CLI can has the same format(a list divided by comma) with UPGRADE_FROM_VELERO_VERSION
# Upgrade tests will be executed sequently according to the list by UPGRADE_FROM_VELERO_VERSION # Upgrade tests will be executed sequently according to the list by UPGRADE_FROM_VELERO_VERSION

12
test/util/velero/velero_utils.go
View File

@@ -87,13 +87,13 @@ var ImagesMatrix = map[string]map[string][]string{
"velero-restore-helper": {"velero/velero-restore-helper:v1.15.2"}, "velero-restore-helper": {"velero/velero-restore-helper:v1.15.2"},
}, },
"v1.16": { "v1.16": {
"aws": {"velero/velero-plugin-for-aws:v1.12.0"}, "aws": {"velero/velero-plugin-for-aws:v1.12.2"},
"azure": {"velero/velero-plugin-for-microsoft-azure:v1.12.0"}, "azure": {"velero/velero-plugin-for-microsoft-azure:v1.12.2"},
"vsphere": {"vsphereveleroplugin/velero-plugin-for-vsphere:v1.5.2"}, "vsphere": {"vsphereveleroplugin/velero-plugin-for-vsphere:v1.5.2"},
"gcp": {"velero/velero-plugin-for-gcp:v1.12.0"}, "gcp": {"velero/velero-plugin-for-gcp:v1.12.2"},
"datamover": {"velero/velero-plugin-for-aws:v1.12.0"}, "datamover": {"velero/velero-plugin-for-aws:v1.12.2"},
"velero": {"velero/velero:v1.15.0"}, "velero": {"velero/velero:v1.16.2"},
"velero-restore-helper": {"velero/velero:v1.16.0"}, "velero-restore-helper": {"velero/velero:v1.16.2"},
}, },
"main": { "main": {
"aws": {"velero/velero-plugin-for-aws:main"}, "aws": {"velero/velero-plugin-for-aws:main"},