diff --git a/pkg/cmd/server/server.go b/pkg/cmd/server/server.go index ad2edf838..402ced0b6 100644 --- a/pkg/cmd/server/server.go +++ b/pkg/cmd/server/server.go @@ -472,6 +472,7 @@ var defaultRestorePriorities = []string{ "serviceaccounts", "limitranges", "pods", + "replicaset", } // watchConfig adds an update event handler to the Config shared informer, invoking s.cancelFunc diff --git a/pkg/restore/restore.go b/pkg/restore/restore.go index 64921a0d3..f8f7eaaa0 100644 --- a/pkg/restore/restore.go +++ b/pkg/restore/restore.go @@ -617,15 +617,6 @@ func (ctx *context) restoreResource(resource, namespace, resourcePath string) (a continue } - if hasControllerOwner(obj.GetOwnerReferences()) { - // non-pods with controller owners shouldn't be restored; pods with controller - // owners should only be restored if they have restic snapshots to restore - if groupResource != kuberesource.Pods || !restic.PodHasSnapshotAnnotation(obj) { - ctx.log.Infof("%s has a controller owner - skipping", kube.NamespaceAndName(obj)) - continue - } - } - complete, err := isCompleted(obj, groupResource) if err != nil { addToResult(&errs, namespace, fmt.Errorf("error checking completion %q: %v", fullPath, err)) diff --git a/pkg/restore/restore_test.go b/pkg/restore/restore_test.go index 73ba5ef43..3f98c703e 100644 --- a/pkg/restore/restore_test.go +++ b/pkg/restore/restore_test.go @@ -433,16 +433,6 @@ func TestRestoreResourceForNamespace(t *testing.T) { labelSelector: labels.SelectorFromSet(labels.Set(map[string]string{"foo": "not-bar"})), fileSystem: arktest.NewFakeFileSystem().WithFile("configmaps/cm-1.json", newTestConfigMap().WithLabels(map[string]string{"foo": "bar"}).ToJSON()), }, - { - name: "items with controller owner are skipped", - namespace: "ns-1", - resourcePath: "configmaps", - labelSelector: labels.NewSelector(), - fileSystem: arktest.NewFakeFileSystem(). - WithFile("configmaps/cm-1.json", newTestConfigMap().WithControllerOwner().ToJSON()). - WithFile("configmaps/cm-2.json", newNamedTestConfigMap("cm-2").ToJSON()), - expectedObjs: toUnstructured(newNamedTestConfigMap("cm-2").ConfigMap), - }, { name: "namespace is remapped", namespace: "ns-2",