fix check-k8s when no longhorn volumes

orange-cloudfoundry · Jan 30, 2025 · e54002c · e54002c
1 parent 82a7406
commit e54002c
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/tools/scripts/check-k8s.sh b/tools/scripts/check-k8s.sh
@@ -33,9 +33,12 @@ checkClusterResources() {
     fi
 
     #--- Check longhorn volumes attachment
-    result="$(kubectl get volumes.longhorn.io -n 02-longhorn -o json | jq -r '.items[]|.status.state + "/" + .status.robustness + " " + .metadata.name + " " + .status.kubernetesStatus.workloadsStatus[].podName + "/" + .spec.nodeID' | grep -v "attached/healthy" | awk '{printf "%-18s %-40s %s\n", $1, $2, $3}')"
-    if [ "${result}" != "" ] ; then
-      printf "\n%bSTATUS             PVC                                      POD/NODE%b\n${result}\n" "${GREEN}" "${STD}"
+    result="$(kubectl get volumes.longhorn.io -n 02-longhorn -o json 2>&1)"
+    if [ $? = 0 ] ; then
+      result="$(echo "${result}" | jq -r '.items[]|.status.state + "/" + .status.robustness + " " + .metadata.name + " " + .status.kubernetesStatus.workloadsStatus[].podName + "/" + .spec.nodeID' | grep -v "attached/healthy" | awk '{printf "%-18s %-40s %s\n", $1, $2, $3}')"
+      if [ "${result}" != "" ] ; then
+        printf "\n%bSTATUS             PVC                                      POD/NODE%b\n${result}\n" "${GREEN}" "${STD}"
+      fi
     fi
 
     #--- Check suspended/not ready flux resources (kustomization, helmchart, helmrelease, helmrepository, gitrepository)
@@ -45,7 +48,7 @@ checkClusterResources() {
       name=$2 ; gsub(".*/", "", name)
       suspended=$3
       ready=$4
-      if (suspended == "True" || ready == "False" || ready == "Unknown") {
+      if (suspended == "True" || ready == "False") {
         printf "%-8s %-6s %-16s %s \n", ready, suspended, kind, namespace"/"name
       }
     }')"