Skip to content

Commit 8dd1f69

Browse files
authored
Merge pull request #113 from banzaicloud/fix-nil-deref
Fix nil deref
2 parents f64fd05 + c1cb303 commit 8dd1f69

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

pkg/inventory/inventory.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ func (c *Inventory) sanitizeDesiredObjects(desiredObjects []runtime.Object) erro
291291
for i := range desiredObjects {
292292
objMeta, err := meta.Accessor(desiredObjects[i])
293293
if err != nil {
294-
return errors.WrapIfWithDetails(err, "couldn't get meta data access for object", "gvk", desiredObjects[i].GetObjectKind().GroupVersionKind().String(), "name", objMeta.GetName())
294+
return errors.WrapIfWithDetails(err, "couldn't get meta data access for object", "gvk", desiredObjects[i].GetObjectKind().GroupVersionKind().String())
295295
}
296296

297297
isClusterScoped, err := c.IsClusterScoped(desiredObjects[i])
@@ -356,7 +356,7 @@ func (c *Inventory) ensureNamespace(namespace string, objects []runtime.Object)
356356
for i := range objects {
357357
objMeta, err := meta.Accessor(objects[i])
358358
if err != nil {
359-
return errors.WrapIfWithDetails(err, "couldn't get meta data access for object", "gvk", objects[i].GetObjectKind().GroupVersionKind().String(), "name", objMeta.GetName())
359+
return errors.WrapIfWithDetails(err, "couldn't get meta data access for object", "gvk", objects[i].GetObjectKind().GroupVersionKind().String())
360360
}
361361

362362
isClusterScoped, err := c.IsClusterScoped(objects[i])
@@ -375,7 +375,6 @@ func (c *Inventory) ensureNamespace(namespace string, objects []runtime.Object)
375375

376376
func (i *Inventory) Append(namespace, component string, parent reconciler.ResourceOwner, resourceBuilders []reconciler.ResourceBuilder) ([]reconciler.ResourceBuilder, error) {
377377
ns := &core.Namespace{}
378-
var err error
379378
// get the namespace so that we can see if it's under deletion
380379
// we don't care if the namespace does not exist, we might be preparing to run this for the first time
381380
if err := i.genericClient.Get(context.TODO(), client.ObjectKey{Name: namespace}, ns); client.IgnoreNotFound(err) != nil {
@@ -394,5 +393,5 @@ func (i *Inventory) Append(namespace, component string, parent reconciler.Resour
394393
})
395394
}
396395
}
397-
return resourceBuilders, err
396+
return resourceBuilders, nil
398397
}

0 commit comments

Comments
 (0)