PPC: ghw: filter out namespaces dir

The previous code fails to run PPC when there is a namespace that has a
suffix `nodes`. ensure filtering the namespace directory to allow PPC to
work when such namespaces exist.

Signed-off-by: Shereen Haj <shajmakh@redhat.com>

Author: shajmakh

pkg/performanceprofile/profilecreator/ghwhandler.go

@@ -34,7 +34,7 @@ import (
 func NewGHWHandler(mustGatherDirPath string, node *v1.Node) (*GHWHandler, error) {
 	nodeName := node.GetName()
 	nodePathSuffix := path.Join(nodes)
-	nodepath, err := getMustGatherFullPathsWithFilter(mustGatherDirPath, nodePathSuffix, clusterScopedResources)
+	nodepath, err := getMustGatherFullPathsWithFilter(mustGatherDirPath, nodePathSuffix, clusterScopedResources, namespaces)
 	if err != nil {
 		return nil, fmt.Errorf("can't obtain the node path %s: %v", nodeName, err)
 	}

pkg/performanceprofile/profilecreator/mustgather.go

@@ -42,21 +42,26 @@ const (
 	yamlSuffix = ".yaml"
 	// nodes defines the subpath, relative to top-level must-gather directory, on which we find node-specific data
 	nodes = "nodes"
+	// namespaces defines the subpath, relative to top-level must-gather directory, on which we find openshift namespace-specific data
+	namespaces = "namespaces"
 	// sysInfoFileName defines the name of the file where ghw snapshot is stored
 	sysInfoFileName = "sysinfo.tgz"
 	// configOCPInfra defines the sub path relative to ClusterScopedResources, on which OCP infrastructure object is
 	configOCPInfra = "config.openshift.io/infrastructures"
 )
 
-func getMustGatherFullPathsWithFilter(mustGatherPath string, suffix string, filter string) (string, error) {
+func getMustGatherFullPathsWithFilter(mustGatherPath string, suffix string, filters ...string) (string, error) {
 	var paths []string
 
-	// don't assume directory names, only look for the suffix, filter out files having "filter" in their names
+	// don't assume directory names, only look for the suffix, filter out files having "filters" in their names
 	err := filepath.Walk(mustGatherPath, func(path string, info os.FileInfo, err error) error {
 		if strings.HasSuffix(path, suffix) {
-			if len(filter) == 0 || !strings.Contains(path, filter) {
-				paths = append(paths, path)
+			for _, f := range filters {
+				if strings.Contains(path, f) {
+					return nil
+				}
 			}
+			paths = append(paths, path)
 		}
 		return nil
 	})
@@ -68,14 +73,14 @@ func getMustGatherFullPathsWithFilter(mustGatherPath string, suffix string, filt
 	}
 	if len(paths) > 1 {
 		Alert("Multiple matches for the specified must gather directory path: %s and suffix: %s", mustGatherPath, suffix)
-		return "", fmt.Errorf("Multiple matches for the specified must gather directory path: %s and suffix: %s.\n Expected only one performance-addon-operator-must-gather* directory, please check the must-gather tarball", mustGatherPath, suffix)
+		return "", fmt.Errorf("multiple matches for the specified must gather directory path: %s and suffix: %s.\n Expected only one performance-addon-operator-must-gather* directory, please check the must-gather tarball", mustGatherPath, suffix)
 	}
 	// returning one possible path
 	return paths[0], err
 }
 
 func getMustGatherFullPaths(mustGatherPath string, suffix string) (string, error) {
-	return getMustGatherFullPathsWithFilter(mustGatherPath, suffix, "")
+	return getMustGatherFullPathsWithFilter(mustGatherPath, suffix)
 }
 
 func getNode(mustGatherDirPath, nodeName string) (*v1.Node, error) {