Merge branch 'master' into feature/ui-adding-filters-to-problems-tab-…

…1-x-master
uselagoon · Feb 23, 2021 · 8946da1 · 8946da1
2 parents fa38fa1 + 94d4d00
commit 8946da1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/services/ssh/home/rsh.sh b/services/ssh/home/rsh.sh
@@ -122,7 +122,8 @@ fi
 if [[ $($OC get deployment -l "lagoon.sh/service=${SERVICE}" 2> /dev/null) ]]; then
   DEPLOYMENT=$($OC get deployment -l "lagoon.sh/service=${SERVICE}" -o name)
   # If the deployment is scaled to 0, scale to 1
-  if [[ $($OC get ${DEPLOYMENT} -o go-template --template='{{.status.replicas}}') == "0" ]]; then
+  # .status.replicas doesn't exist on a scaled to 0 deployment in k8s so assume it is 0 if nothing is returned
+  if [[ $($OC get ${DEPLOYMENT} -o json | jq -r '.status.replicas // 0') == "0" ]]; then
 
     $OC scale --replicas=1 ${DEPLOYMENT} >/dev/null 2>&1
 
@@ -139,7 +140,8 @@ fi
 if [[ $($OC get deployment -l lagoon/service=${SERVICE} 2> /dev/null) ]]; then
   DEPLOYMENT=$($OC get deployment -l lagoon/service=${SERVICE} -o name)
   # If the deployment is scaled to 0, scale to 1
-  if [[ $($OC get ${DEPLOYMENT} -o go-template --template='{{.status.replicas}}') == "0" ]]; then
+  # .status.replicas doesn't exist on a scaled to 0 deployment in k8s so assume it is 0 if nothing is returned
+  if [[ $($OC get ${DEPLOYMENT} -o json | jq -r '.status.replicas // 0') == "0" ]]; then
 
     $OC scale --replicas=1 ${DEPLOYMENT} >/dev/null 2>&1