Merge pull request #166 from kubernetes-sigs/fix_logspam

k8s-ci-robot · web-flow · commit 4860dbf5d6cf · 2021-07-26T17:40:44.000-07:00
GetObjectFromCluster should preserve error chain
diff --git a/pkg/patterns/declarative/reconciler.go b/pkg/patterns/declarative/reconciler.go
@@ -571,13 +571,13 @@ func GetObjectFromCluster(obj *manifest.Object, r *Reconciler) (*unstructured.
 
 	mapping, err := r.restMapper.RESTMapping(obj.GroupKind(), gvk.Version)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get resource: %v", err)
+		return nil, fmt.Errorf("unable to get mapping for resource: %w", err)
 	}
 	ns := obj.UnstructuredObject().GetNamespace()
 	unstruct, err := r.dynamicClient.Resource(mapping.Resource).Namespace(ns).Get(context.Background(),
 		obj.Name, getOptions)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get mapping for resource: %v", err)
+		return nil, fmt.Errorf("unable to get object: %w", err)
 	}
 	return unstruct, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -571,13 +571,13 @@ func GetObjectFromCluster(obj manifest.Object, r Reconciler) (*unstructured.`
`571`	`571`
`572`	`572`	`mapping, err := r.restMapper.RESTMapping(obj.GroupKind(), gvk.Version)`
`573`	`573`	`if err != nil {`
`574`		`- return nil, fmt.Errorf("unable to get resource: %v", err)`
	`574`	`+ return nil, fmt.Errorf("unable to get mapping for resource: %w", err)`
`575`	`575`	`}`
`576`	`576`	`ns := obj.UnstructuredObject().GetNamespace()`
`577`	`577`	`unstruct, err := r.dynamicClient.Resource(mapping.Resource).Namespace(ns).Get(context.Background(),`
`578`	`578`	`obj.Name, getOptions)`
`579`	`579`	`if err != nil {`
`580`		`- return nil, fmt.Errorf("unable to get mapping for resource: %v", err)`
	`580`	`+ return nil, fmt.Errorf("unable to get object: %w", err)`
`581`	`581`	`}`
`582`	`582`	`return unstruct, nil`
`583`	`583`	`}`