Merge pull request #209 from rluders/fix-duplicate-namespaces

Bug 1886462: Add the namespace to the gatherers reports to avoid conflicts

Author: openshift-merge-robot

.gitignore

@@ -1,3 +1,4 @@
 /*.pprof
 main
 .vscode/
+.idea/

pkg/gather/clusterconfig/clusterconfig.go

@@ -182,8 +182,12 @@ func GatherPodDisruptionBudgets(i *Gatherer) func() ([]record.Record, []error) {
 		}
 		records := []record.Record{}
 		for _, pdb := range pdbs.Items {
+			recordName := fmt.Sprintf("config/pdbs/%s", pdb.GetName())
+			if pdb.GetNamespace() != "" {
+				recordName = fmt.Sprintf("config/pdbs/%s/%s", pdb.GetNamespace(), pdb.GetName())
+			}
 			records = append(records, record.Record{
-				Name: fmt.Sprintf("config/pdbs/%s", pdb.GetName()),
+				Name: recordName,
 				Item: PodDisruptionBudgetsAnonymizer{&pdb},
 			})
 		}
@@ -340,7 +344,10 @@ func GatherClusterOperators(i *Gatherer) func() ([]record.Record, []error) {
 		}
 		records := make([]record.Record, 0, len(config.Items))
 		for index := range config.Items {
-			records = append(records, record.Record{Name: fmt.Sprintf("config/clusteroperator/%s", config.Items[index].Name), Item: ClusterOperatorAnonymizer{&config.Items[index]}})
+			records = append(records, record.Record{
+				Name: fmt.Sprintf("config/clusteroperator/%s", config.Items[index].Name),
+				Item: ClusterOperatorAnonymizer{&config.Items[index]},
+			})
 		}
 		namespaceEventsCollected := sets.NewString()
 		now := time.Now()
@@ -478,10 +485,16 @@ func GatherConfigMaps(i *Gatherer) func() ([]record.Record, []error) {
 		records := make([]record.Record, 0, len(cms.Items))
 		for i := range cms.Items {
 			for dk, dv := range cms.Items[i].Data {
-				records = append(records, record.Record{Name: fmt.Sprintf("config/configmaps/%s/%s", cms.Items[i].Name, dk), Item: ConfigMapAnonymizer{v: []byte(dv), encodeBase64: false}})
+				records = append(records, record.Record{
+					Name: fmt.Sprintf("config/configmaps/%s/%s", cms.Items[i].Name, dk),
+					Item: ConfigMapAnonymizer{v: []byte(dv), encodeBase64: false},
+				})
 			}
 			for dk, dv := range cms.Items[i].BinaryData {
-				records = append(records, record.Record{Name: fmt.Sprintf("config/configmaps/%s/%s", cms.Items[i].Name, dk), Item: ConfigMapAnonymizer{v: dv, encodeBase64: true}})
+				records = append(records, record.Record{
+					Name: fmt.Sprintf("config/configmaps/%s/%s", cms.Items[i].Name, dk),
+					Item: ConfigMapAnonymizer{v: dv, encodeBase64: true},
+				})
 			}
 		}
 
@@ -585,7 +598,10 @@ func GatherHostSubnet(i *Gatherer) func() ([]record.Record, []error) {
 		}
 		records := make([]record.Record, 0, len(hostSubnetList.Items))
 		for _, h := range hostSubnetList.Items {
-			records = append(records, record.Record{Name: fmt.Sprintf("config/hostsubnet/%s", h.Host), Item: HostSubnetAnonymizer{&h}})
+			records = append(records, record.Record{
+				Name: fmt.Sprintf("config/hostsubnet/%s", h.Host),
+				Item: HostSubnetAnonymizer{&h},
+			})
 		}
 		return records, nil
 	}
@@ -747,7 +763,10 @@ func GatherCertificateSigningRequests(i *Gatherer) func() ([]record.Record, []er
 		}
 		records := make([]record.Record, len(csrs))
 		for i, sr := range csrs {
-			records[i] = record.Record{Name: fmt.Sprintf("config/certificatesigningrequests/%s", sr.ObjectMeta.Name), Item: sr}
+			records[i] = record.Record{
+				Name: fmt.Sprintf("config/certificatesigningrequests/%s", sr.ObjectMeta.Name),
+				Item: sr,
+			}
 		}
 		return records, nil
 	}
@@ -807,8 +826,12 @@ func GatherMachineSet(i *Gatherer) func() ([]record.Record, []error) {
 		}
 		records := []record.Record{}
 		for _, i := range machineSets.Items {
+			recordName := fmt.Sprintf("machinesets/%s", i.GetName())
+			if i.GetNamespace() != "" {
+				recordName = fmt.Sprintf("machinesets/%s/%s", i.GetNamespace(), i.GetName())
+			}
 			records = append(records, record.Record{
-				Name: fmt.Sprintf("machinesets/%s", i.GetName()),
+				Name: recordName,
 				Item: record.JSONMarshaller{Object: i.Object},
 			})
 		}