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

Restore Endpoints before Services (#6317)

Browse Source 
Restore Endpoints before Services

Fixes #6280

Signed-off-by: Wenkai Yin(尹文开) <yinw@vmware.com>
This commit is contained in:
Wenkai Yin(尹文开)
2023-06-20 14:34:38 +08:00
committed by GitHub
parent 05dcbcd9e3
commit 788013bb1e
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelogs/unreleased/6317-ywk253100 Normal file
View File

@@ -0,0 +1 @@
Restore Endpoints before Services

2
pkg/cmd/server/server.go
View File

@@ -508,6 +508,7 @@ func (s *server) veleroResourcesExist() error {
// - Replica sets go before deployments/other controllers so they can be explicitly
// restored and be adopted by controllers.
// - CAPI ClusterClasses go before Clusters.
// - Endpoints go before Services so no new Endpoints will be created
// - Services go before Clusters so they can be adopted by AKO-operator and no new Services will be created
// for the same clusters
//
@@ -538,6 +539,7 @@ var defaultRestorePriorities = restore.Priorities{
// in the backup.
"replicasets.apps",
"clusterclasses.cluster.x-k8s.io",
"endpoints",
"services",
},
LowPriorities: []string{

2
pkg/uploader/provider/provider.go
View File

@@ -71,7 +71,7 @@ func NewUploaderProvider(
log logrus.FieldLogger,
) (Provider, error) {
if credGetter.FromFile == nil {
return nil, errors.New("uninitialized FileStore credentail is not supported")
return nil, errors.New("uninitialized FileStore credential is not supported")
}
if uploaderType == uploader.KopiaType {
// We use the hardcode repositoryType velerov1api.BackupRepositoryTypeKopia for now, because we have only one implementation of unified repo.