Merge pull request #939 from jlojosnegros/nro_error_messages

must-gather: numaresources: Avoid error messages when NRO is not installed

must-gather/collection-scripts/gather_nro

@@ -1,17 +1,22 @@
 #!/usr/bin/env bash
 
-# get crds
-for crd_name in numaresourcesschedulers.nodetopology.openshift.io numaresourcesoperators.nodetopology.openshift.io noderesourcetopologies.topology.node.k8s.io
-do
-    # get crd definition
-    oc adm inspect --dest-dir must-gather crd/${crd_name}
-
-    # get crd instances
-    oc adm inspect --dest-dir must-gather ${crd_name}
-done
-
 # Get NRO namespace and gather all the data there
 . namespace
 NRO_NAMESPACE=$(nro_namespace)
 
-oc adm inspect --dest-dir must-gather ns/${NRO_NAMESPACE}
+if [ -z "$NRO_NAMESPACE" ]
+then
+    echo "Numaresources Operator namespace not detected. Skipping NRO data gathering"
+else
+    # get crds
+    for crd_name in numaresourcesschedulers.nodetopology.openshift.io numaresourcesoperators.nodetopology.openshift.io noderesourcetopologies.topology.node.k8s.io
+    do
+        # get crd definition
+        oc adm inspect --dest-dir must-gather crd/${crd_name}
+
+        # get crd instances
+        oc adm inspect --dest-dir must-gather ${crd_name}
+    done
+
+    oc adm inspect --dest-dir must-gather ns/${NRO_NAMESPACE}
+fi

must-gather/collection-scripts/namespace

@@ -22,8 +22,5 @@ function nro_namespace() {
   # namespace suggested by the documentation. This is a fancier way to check for its existence
   [ -z "${ns}" ] && ns=$(oc get ns openshift-numaresources -o=jsonpath='{.metadata.name}{"\n"}' 2> /dev/null )
 
-  # we should never get there. This is the last resort.
-  [ -z "${ns}" ] && ns="openshift-numaresources"
-
   echo ${ns}
 }