Skip to content

Commit 481aab7

Browse files
authored
Merge pull request #65 from replicatedhq/error-handling
Error handling in cluster resources
2 parents 4153b9a + 0b7aff6 commit 481aab7

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

pkg/collect/cluster_resources.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,17 @@ func ClusterResources(ctx *Context) ([]byte, error) {
4141
clusterResourcesOutput := &ClusterResourcesOutput{}
4242

4343
// namespaces
44-
namespaces, namespaceList, nsErrors := namespaces(client)
44+
namespaces, namespaceList, namespaceErrors := namespaces(client)
4545
clusterResourcesOutput.Namespaces = namespaces
46-
clusterResourcesOutput.NamespacesErrors, err = marshalNonNil(nsErrors)
46+
clusterResourcesOutput.NamespacesErrors, err = marshalNonNil(namespaceErrors)
4747
if err != nil {
4848
return nil, err
4949
}
50-
5150
namespaceNames := make([]string, 0, 0)
52-
for _, namespace := range namespaceList.Items {
53-
namespaceNames = append(namespaceNames, namespace.Name)
51+
if namespaceList != nil {
52+
for _, namespace := range namespaceList.Items {
53+
namespaceNames = append(namespaceNames, namespace.Name)
54+
}
5455
}
5556

5657
pods, podErrors := pods(client, namespaceNames)

0 commit comments

Comments
 (0)