Do not assume replicas are active/ready. Diagnostics are still useful (and particularly so) if pods are not in those states.

Signed-off-by: Kevin Grigorenko <kevin.grigorenko@us.ibm.com>

Author: kgibm

containerdiag.bat

@@ -21,7 +21,7 @@
 
 SETLOCAL ENABLEDELAYEDEXPANSION
 
-set "VERSION=0.1.20230227"
+set "VERSION=0.1.20230301"
 set "SCRIPTNAME=%~nx0"
 
 goto :start
@@ -148,20 +148,20 @@ if "!NAMESPACE!" == "" (
 )
 
 if not "!TARGETDEPLOYMENT!" == "" (
-  call :printInfo Querying available replicas for deployment !TARGETDEPLOYMENT! in namespace !NAMESPACE!
+  call :printInfo Querying replicas for deployment !TARGETDEPLOYMENT! in namespace !NAMESPACE!
 
-  for /F "tokens=* USEBACKQ" %%x in (`!CTL! get deployment !TARGETDEPLOYMENT! "--namespace=!NAMESPACE!" "--output=jsonpath={.status.availableReplicas}"`) do set "AVAILABLEREPLICAS=%%x"
-  if "!AVAILABLEREPLICAS!" == "" (
+  for /F "tokens=* USEBACKQ" %%x in (`!CTL! get deployment !TARGETDEPLOYMENT! "--namespace=!NAMESPACE!" "--output=jsonpath={.status.replicas}"`) do set "REPLICAS=%%x"
+  if "!REPLICAS!" == "" (
     call :printInfo Error getting deployment information. Ensure you specify the right namespace with -n NAMESPACE
     exit /B 1
   )
 
-  if "!AVAILABLEREPLICAS!" == "0" (
-    call :printInfo There are 0 available replicas for this deployment
+  if "!REPLICAS!" == "0" (
+    call :printInfo There are 0 replicas for this deployment
     exit /B 1
   )
 
-  call :printInfo There are !AVAILABLEREPLICAS! available replicas
+  call :printInfo There are !REPLICAS! replicas
 
   call :printInfo Querying deployment selector label
 

containerdiag.sh

@@ -35,7 +35,7 @@ EOF
   exit 22
 }
 
-VERSION="0.1.20230227"
+VERSION="0.1.20230301"
 NAMESPACE=""
 VERBOSE=0
 APPEND=1
@@ -143,28 +143,28 @@ processPod() {
 }
 
 if [ "${TARGETDEPLOYMENT}" != "" ]; then
-  printInfo "Querying available replicas for deployment ${TARGETDEPLOYMENT} in namespace ${NAMESPACE}"
+  printInfo "Querying replicas for deployment ${TARGETDEPLOYMENT} in namespace ${NAMESPACE}"
 
   # Let's check if the deployment has any active pods
-  AVAILABLEREPLICAS="$("${CTL}" get deployment "${TARGETDEPLOYMENT}" "--namespace=${NAMESPACE}" "--output=jsonpath={.status.availableReplicas}")"
+  REPLICAS="$("${CTL}" get deployment "${TARGETDEPLOYMENT}" "--namespace=${NAMESPACE}" "--output=jsonpath={.status.replicas}")"
   RC="${?}"
 
   if [ ${RC} -ne 0 ]; then
     printInfo "Error ${RC} getting deployment information (see previous output). Ensure you specify the right namespace with -n NAMESPACE"
     exit ${RC}
   fi
 
-  if [ "${AVAILABLEREPLICAS}" = "" ]; then
+  if [ "${REPLICAS}" = "" ]; then
     printInfo "Error getting deployment information. Ensure you specify the right namespace with -n NAMESPACE"
     exit 1
   fi
 
-  if [ "${AVAILABLEREPLICAS}" -eq 0 ]; then
-    printInfo "Error: There are 0 available replicas for this deployment"
+  if [ "${REPLICAS}" -eq 0 ]; then
+    printInfo "Error: There are 0 replicas for this deployment"
     exit 1
   fi
 
-  printInfo "There are ${AVAILABLEREPLICAS} available replicas"
+  printInfo "There are ${REPLICAS} replicas"
 
   printInfo "Querying deployment selector label"