mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-10 15:07:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #482 from skriss/add-cohab-resources

Browse Source 
add replicasets and daemonsets to cohabitating resources
This commit is contained in:
Andy Goldstein
2018-05-11 10:02:10 -04:00
committed by GitHub
parent 9fc1711d45 fbb5ead4e9
commit 5bfd4f64db
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/backup/backup.go
View File

@@ -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

6
pkg/backup/backup_test.go
View File

@@ -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,