diff --git a/changelogs/unreleased/6317-ywk253100 b/changelogs/unreleased/6317-ywk253100 new file mode 100644 index 0000000000..d96d6c1fc3 --- /dev/null +++ b/changelogs/unreleased/6317-ywk253100 @@ -0,0 +1 @@ +Restore Endpoints before Services \ No newline at end of file diff --git a/pkg/cmd/server/server.go b/pkg/cmd/server/server.go index ba8b5685be..600866fc17 100644 --- 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 index 3d0c452dc9..042b9f4407 100644 --- 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.