From 90179d65be997f190e0a913d3db45a213754d52b Mon Sep 17 00:00:00 2001 From: haraprasadj Date: Thu, 8 Jul 2021 14:02:11 -0500 Subject: [PATCH 1/2] donot check portal health when not deployed --- check-pod-health.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/check-pod-health.sh b/check-pod-health.sh index 2851c2b95..6ea47e828 100644 --- a/check-pod-health.sh +++ b/check-pod-health.sh @@ -16,6 +16,8 @@ fence="${commons_url}/user/jwt/keys" selenium="selenium-hub:4444/status" if [ -n $1 ] && [ "$1" == "dataguids.org" ]; then health_endpoints=( $indexd $portal $selenium ) +elif if ! (g3kubectl get pods --no-headers -l app=portal | grep portal) > /dev/null 2>&1; then + health_endpoints=( $sheepdog $peregrine $fence $selenium ) else health_endpoints=( $sheepdog $peregrine $portal $fence $selenium ) fi From 64494ff5afe42e3d596be761c0e05ab9bd884cf3 Mon Sep 17 00:00:00 2001 From: haraprasadj Date: Thu, 8 Jul 2021 16:14:17 -0500 Subject: [PATCH 2/2] fix --- check-pod-health.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check-pod-health.sh b/check-pod-health.sh index 6ea47e828..98c50a649 100644 --- a/check-pod-health.sh +++ b/check-pod-health.sh @@ -16,7 +16,7 @@ fence="${commons_url}/user/jwt/keys" selenium="selenium-hub:4444/status" if [ -n $1 ] && [ "$1" == "dataguids.org" ]; then health_endpoints=( $indexd $portal $selenium ) -elif if ! (g3kubectl get pods --no-headers -l app=portal | grep portal) > /dev/null 2>&1; then +elif ! (g3kubectl get pods --no-headers -l app=portal | grep portal) > /dev/null 2>&1; then health_endpoints=( $sheepdog $peregrine $fence $selenium ) else health_endpoints=( $sheepdog $peregrine $portal $fence $selenium )