Skip to content

Commit 7eb1d5a

Browse files
committed
better parse namespaces, and parse legacy list-of-pods storage format
1 parent 40cdc68 commit 7eb1d5a

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

pkg/analyze/cluster_pod_statuses.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func clusterPodStatuses(analyzer *troubleshootv1beta2.ClusterPodStatuses, getChi
2222

2323
var pods []corev1.Pod
2424
for fileName, fileContent := range collected {
25-
podsNs := strings.TrimSuffix(fileName, ".json")
25+
podsNs := strings.TrimSuffix(filepath.Base(fileName), ".json")
2626
include := len(analyzer.Namespaces) == 0
2727
for _, ns := range analyzer.Namespaces {
2828
if ns == podsNs {
@@ -33,9 +33,14 @@ func clusterPodStatuses(analyzer *troubleshootv1beta2.ClusterPodStatuses, getChi
3333
if include {
3434
var nsPods corev1.PodList
3535
if err := json.Unmarshal(fileContent, &nsPods); err != nil {
36-
return nil, errors.Wrapf(err, "failed to unmarshal pods list for namespace %s", podsNs)
36+
var nsPodsArr []corev1.Pod
37+
if err := json.Unmarshal(fileContent, &nsPodsArr); err != nil {
38+
return nil, errors.Wrapf(err, "failed to unmarshal pods list for namespace %s", podsNs)
39+
}
40+
pods = append(pods, nsPodsArr...)
41+
} else {
42+
pods = append(pods, nsPods.Items...)
3743
}
38-
pods = append(pods, nsPods.Items...)
3944
}
4045
}
4146

0 commit comments

Comments
 (0)