From fbb5ead4e9fd8a648bb25222b060ceb4715c906a Mon Sep 17 00:00:00 2001 From: Steve Kriss Date: Thu, 10 May 2018 14:12:24 -0700 Subject: [PATCH] add replicasets and daemonsets to cohabitating resources Signed-off-by: Steve Kriss --- pkg/backup/backup.go | 14 ++++++++------ pkg/backup/backup_test.go | 6 ------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/pkg/backup/backup.go b/pkg/backup/backup.go index 0a926985d..c8c3646cd 100644 --- a/pkg/backup/backup.go +++ b/pkg/backup/backup.go @@ -73,6 +73,14 @@ func (i *itemKey) String() string { return fmt.Sprintf("resource=%s,namespace=%s,name=%s", i.resource, i.namespace, i.name) } +var cohabitatingResources = map[string]*cohabitatingResource{ + "deployments": newCohabitatingResource("deployments", "extensions", "apps"), + "daemonsets": newCohabitatingResource("daemonsets", "extensions", "apps"), + "replicasets": newCohabitatingResource("replicasets", "extensions", "apps"), + "networkpolicies": newCohabitatingResource("networkpolicies", "extensions", "networking.k8s.io"), + "events": newCohabitatingResource("events", "", "events.k8s.io"), +} + // NewKubernetesBackupper creates a new kubernetesBackupper. func NewKubernetesBackupper( discoveryHelper discovery.Helper, @@ -230,12 +238,6 @@ func (kb *kubernetesBackupper) Backup(backup *api.Backup, backupFile, logFile io backedUpItems := make(map[itemKey]struct{}) var errs []error - cohabitatingResources := map[string]*cohabitatingResource{ - "deployments": newCohabitatingResource("deployments", "extensions", "apps"), - "networkpolicies": newCohabitatingResource("networkpolicies", "extensions", "networking.k8s.io"), - "events": newCohabitatingResource("events", "", "events.k8s.io"), - } - resolvedActions, err := resolveActions(actions, kb.discoveryHelper) if err != nil { return err diff --git a/pkg/backup/backup_test.go b/pkg/backup/backup_test.go index 9474576cf..4a51f6376 100644 --- a/pkg/backup/backup_test.go +++ b/pkg/backup/backup_test.go @@ -524,12 +524,6 @@ func TestBackup(t *testing.T) { groupBackupper := &mockGroupBackupper{} defer groupBackupper.AssertExpectations(t) - cohabitatingResources := map[string]*cohabitatingResource{ - "deployments": newCohabitatingResource("deployments", "extensions", "apps"), - "networkpolicies": newCohabitatingResource("networkpolicies", "extensions", "networking.k8s.io"), - "events": newCohabitatingResource("events", "", "events.k8s.io"), - } - groupBackupperFactory.On("newGroupBackupper", mock.Anything, // log test.backup,