Merge branch 'main' into vgdp-for-fs-backup-design

This commit is contained in:
lyndon-li
2025-05-29 11:02:55 +08:00
committed by GitHub
3 changed files with 4 additions and 1 deletions

View File

@@ -0,0 +1 @@
fix: update mc command in minio-deployment example

View File

@@ -107,7 +107,7 @@ spec:
command:
- /bin/sh
- -c
- "mc --config-dir=/config config host add velero http://minio:9000 minio minio123 && mc --config-dir=/config mb -p velero/velero"
- "mc --config-dir=/config alias set velero http://minio:9000 minio minio123 && mc --config-dir=/config mb -p velero/velero"
volumeMounts:
- name: config
mountPath: "/config"

View File

@@ -69,6 +69,8 @@ func (m *MultiNSBackup) Init() error {
for _, excludeNamespace := range namespaces.Items {
*m.NSExcluded = append(*m.NSExcluded, excludeNamespace.Name)
}
// Add Velero installed namespace into the exclude list.
*m.NSExcluded = append(*m.NSExcluded, m.VeleroCfg.VeleroNamespace)
m.BackupArgs = []string{
"create", "--namespace", m.VeleroCfg.VeleroNamespace, "backup", m.BackupName,