From 131c6de407ffd97c802f89df0dd182b44c62375e Mon Sep 17 00:00:00 2001 From: "F. Gold" Date: Wed, 2 Feb 2022 10:39:13 -0800 Subject: [PATCH 1/3] Check for nil before logging DefaultVolumestToRestic value Signed-off-by: F. Gold --- pkg/backup/backup.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/backup/backup.go b/pkg/backup/backup.go index ef03e78f7..15fba183d 100644 --- a/pkg/backup/backup.go +++ b/pkg/backup/backup.go @@ -200,7 +200,11 @@ func (kb *kubernetesBackupper) BackupWithResolvers(log logrus.FieldLogger, backupRequest.ResourceIncludesExcludes = collections.GetResourceIncludesExcludes(kb.discoveryHelper, backupRequest.Spec.IncludedResources, backupRequest.Spec.ExcludedResources) log.Infof("Including resources: %s", backupRequest.ResourceIncludesExcludes.IncludesString()) log.Infof("Excluding resources: %s", backupRequest.ResourceIncludesExcludes.ExcludesString()) - log.Infof("Backing up all pod volumes using restic: %t", *backupRequest.Backup.Spec.DefaultVolumesToRestic) + if backupRequest.Backup.Spec.DefaultVolumesToRestic != nil { + log.Infof("Backing up all pod volumes using Restic: %t", *backupRequest.Backup.Spec.DefaultVolumesToRestic) + } else { + log.Infof("DefaultVolumesToRestic for backing up all pod volumes using Restic is %v", backupRequest.Backup.Spec.DefaultVolumesToRestic) + } var err error backupRequest.ResourceHooks, err = getResourceHooks(backupRequest.Spec.Hooks.Resources, kb.discoveryHelper) From 95c43d5b657db49d39d401e393f1be8b2957f9db Mon Sep 17 00:00:00 2001 From: "F. Gold" Date: Wed, 2 Feb 2022 17:02:22 -0800 Subject: [PATCH 2/3] Minor change to trigger GitHub actions Signed-off-by: F. Gold --- pkg/backup/backup.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/backup/backup.go b/pkg/backup/backup.go index 15fba183d..c201fc5e9 100644 --- a/pkg/backup/backup.go +++ b/pkg/backup/backup.go @@ -1,5 +1,5 @@ /* -Copyright the Velero contributors. +Copyright the Velero Contributors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 491942cf2de685a6ba85a61b38b3c9338b7b1113 Mon Sep 17 00:00:00 2001 From: "F. Gold" Date: Wed, 9 Feb 2022 16:58:07 -0800 Subject: [PATCH 3/3] Simplify by assuming nil is false and use boolptr util function Signed-off-by: F. Gold --- pkg/backup/backup.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkg/backup/backup.go b/pkg/backup/backup.go index c201fc5e9..697be8500 100644 --- a/pkg/backup/backup.go +++ b/pkg/backup/backup.go @@ -47,6 +47,7 @@ import ( "github.com/vmware-tanzu/velero/pkg/plugin/velero" "github.com/vmware-tanzu/velero/pkg/podexec" "github.com/vmware-tanzu/velero/pkg/restic" + "github.com/vmware-tanzu/velero/pkg/util/boolptr" "github.com/vmware-tanzu/velero/pkg/util/collections" ) @@ -200,11 +201,7 @@ func (kb *kubernetesBackupper) BackupWithResolvers(log logrus.FieldLogger, backupRequest.ResourceIncludesExcludes = collections.GetResourceIncludesExcludes(kb.discoveryHelper, backupRequest.Spec.IncludedResources, backupRequest.Spec.ExcludedResources) log.Infof("Including resources: %s", backupRequest.ResourceIncludesExcludes.IncludesString()) log.Infof("Excluding resources: %s", backupRequest.ResourceIncludesExcludes.ExcludesString()) - if backupRequest.Backup.Spec.DefaultVolumesToRestic != nil { - log.Infof("Backing up all pod volumes using Restic: %t", *backupRequest.Backup.Spec.DefaultVolumesToRestic) - } else { - log.Infof("DefaultVolumesToRestic for backing up all pod volumes using Restic is %v", backupRequest.Backup.Spec.DefaultVolumesToRestic) - } + log.Infof("Backing up all pod volumes using Restic: %t", boolptr.IsSetToTrue(backupRequest.Backup.Spec.DefaultVolumesToRestic)) var err error backupRequest.ResourceHooks, err = getResourceHooks(backupRequest.Spec.Hooks.Resources, kb.discoveryHelper)