Restore Endpoints before Services (#6317)

Restore Endpoints before Services Fixes #6280 Signed-off-by: Wenkai Yin(尹文开) <[email protected]>
vmware-tanzu · Jun 20, 2023 · 788013b · 788013b
1 parent 05dcbcd
commit 788013b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/changelogs/unreleased/6317-ywk253100 b/changelogs/unreleased/6317-ywk253100
@@ -0,0 +1 @@
+Restore Endpoints before Services
diff --git a/pkg/cmd/server/server.go b/pkg/cmd/server/server.go
@@ -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{

diff --git a/pkg/uploader/provider/provider.go b/pkg/uploader/provider/provider.go
@@ -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.