mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-06 05:25:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use pointers when printing schema.GroupResource

Browse Source 
Signed-off-by: Andy Goldstein <andy.goldstein@gmail.com>
This commit is contained in:
Andy Goldstein
2017-09-12 16:53:02 -04:00
parent 9deb4d4cae
commit e8a88747eb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/restore/restore.go
View File

@@ -451,22 +451,22 @@ func (ctx *context) restoreResourceForNamespace(namespace string, resourcePath s
var err error
resourceClient, err = ctx.dynamicFactory.ClientForGroupVersionKind(obj.GroupVersionKind(), resource, namespace)
if err != nil {
addArkError(&errors, fmt.Errorf("error getting resource client for namespace %q, resource %q: %v", namespace, groupResource, err))
addArkError(&errors, fmt.Errorf("error getting resource client for namespace %q, resource %q: %v", namespace, &groupResource, err))
return warnings, errors
}
restorer = ctx.restorers[groupResource]
if restorer == nil {
ctx.log("Using default restorer for %v", groupResource)
ctx.log("Using default restorer for %v", &groupResource)
restorer = restorers.NewBasicRestorer(true)
} else {
ctx.log("Using custom restorer for %v", groupResource)
ctx.log("Using custom restorer for %v", &groupResource)
}
if restorer.Wait() {
itmWatch, err := resourceClient.Watch(metav1.ListOptions{})
if err != nil {
addArkError(&errors, fmt.Errorf("error watching for namespace %q, resource %q: %v", namespace, groupResource, err))
addArkError(&errors, fmt.Errorf("error watching for namespace %q, resource %q: %v", namespace, &groupResource, err))
return warnings, errors
}
watchChan := itmWatch.ResultChan()
@@ -525,7 +525,7 @@ func (ctx *context) restoreResourceForNamespace(namespace string, resourcePath s
if waiter != nil {
if err := waiter.Wait(); err != nil {
addArkError(&errors, fmt.Errorf("error waiting for all %v resources to be created in namespace %s: %v", groupResource, namespace, err))
addArkError(&errors, fmt.Errorf("error waiting for all %v resources to be created in namespace %s: %v", &groupResource, namespace, err))
}
}