From 226a687c01550bd19dbae28234e016a5dad1bb10 Mon Sep 17 00:00:00 2001 From: Michal Wieczorek Date: Tue, 11 Sep 2018 13:41:03 +0200 Subject: [PATCH] Enable restoring resources with ownerReference set Signed-off-by: Michal Wieczorek --- pkg/cmd/server/server.go | 1 + pkg/restore/restore.go | 9 --------- pkg/restore/restore_test.go | 10 ---------- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/pkg/cmd/server/server.go b/pkg/cmd/server/server.go index 2eebbb936..c631dbecc 100644 --- a/pkg/cmd/server/server.go +++ b/pkg/cmd/server/server.go @@ -381,6 +381,7 @@ var defaultResourcePriorities = []string{ "serviceaccounts", "limitranges", "pods", + "replicaset", } func applyConfigDefaults(c *api.Config, logger logrus.FieldLogger) { diff --git a/pkg/restore/restore.go b/pkg/restore/restore.go index 22d404438..f669fe3e6 100644 --- a/pkg/restore/restore.go +++ b/pkg/restore/restore.go @@ -631,15 +631,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.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 51435a7e6..909a1276d 100644 --- a/pkg/restore/restore_test.go +++ b/pkg/restore/restore_test.go @@ -432,16 +432,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").WithArkLabel("my-restore").ConfigMap), - }, { name: "namespace is remapped", namespace: "ns-2",