From 56126fb602f7a4ed0d4e75771c8a442ebfe12654 Mon Sep 17 00:00:00 2001 From: Edgar Lanting Date: Tue, 9 Aug 2022 12:35:04 +0200 Subject: [PATCH] Update cluster_resources.go - Add more readability Made some small changes to improve readability by using `PodDisruptionBudgets` instead of `pdb`. --- pkg/collect/cluster_resources.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkg/collect/cluster_resources.go b/pkg/collect/cluster_resources.go index 0196534c..182ed77f 100644 --- a/pkg/collect/cluster_resources.go +++ b/pkg/collect/cluster_resources.go @@ -99,12 +99,14 @@ func ClusterResources(c *Collector, clusterResourcesCollector *troubleshootv1bet } } - // pod disruption budgets - pdb, pdbError := getPodDisruptionBudgets(ctx, client, namespaceNames) - for k, v := range pdb { - output.SaveResult(c.BundlePath, path.Join("cluster-resources/pdb", k), bytes.NewBuffer(v)) + // pod disruption budgets (for all existing namespaces) + + PodDisruptionBudgets, pdbError := getPodDisruptionBudgets(ctx, client, namespaceNames) + for k, v := range PodDisruptionBudgets { + output.SaveResult(c.BundlePath, path.Join("cluster-resources/pod-disruption-budgets", k), bytes.NewBuffer(v)) } - output.SaveResult(c.BundlePath, "cluster-resources/pdb-info.json", marshalErrors(pdbError)) + output.SaveResult(c.BundlePath, "cluster-resources/pod-disruption-budgets-info.json", marshalErrors(pdbError)) + // services services, servicesErrors := services(ctx, client, namespaceNames) for k, v := range services { @@ -338,18 +340,18 @@ func getPodDisruptionBudgets(ctx context.Context, client *kubernetes.Clientset, errorsByNamespace := make(map[string]string) for _, namespace := range namespaces { - pdb, err := client.PolicyV1beta1().PodDisruptionBudgets(namespace).List(ctx, metav1.ListOptions{}) + PodDisruptionBudgets, err := client.PolicyV1beta1().PodDisruptionBudgets(namespace).List(ctx, metav1.ListOptions{}) if err != nil { errorsByNamespace[namespace] = err.Error() continue } - gvk, err := apiutil.GVKForObject(pdb, scheme.Scheme) + gvk, err := apiutil.GVKForObject(PodDisruptionBudgets, scheme.Scheme) if err == nil { - pdb.GetObjectKind().SetGroupVersionKind(gvk) + PodDisruptionBudgets.GetObjectKind().SetGroupVersionKind(gvk) } - b, err := json.MarshalIndent(pdb, "", " ") + b, err := json.MarshalIndent(PodDisruptionBudgets, "", " ") if err != nil { errorsByNamespace[namespace] = err.Error() continue