Merge pull request #162 from qinlaodeqingwa/patch-3

redis期望与就绪数检测
erda-project · Jul 17, 2023 · 28d5fbb · 28d5fbb
2 parents 4e24696 + 444085d
commit 28d5fbb
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/probers/addon/redis/main.sh b/probers/addon/redis/main.sh
@@ -5,8 +5,8 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
 
 function sential_detect() {
     ## redis sential ready pod detect
-    REPLICAS=$(kubectl get deploy rfs-addon-redis -n default -o yaml | grep ' replicas' | awk '{if (NR > 1){print $2}}')
-    READY=$(kubectl get deploy rfs-addon-redis -n default -o yaml | grep readyReplicas | awk '{print $2}')
+    REPLICAS=$(kubectl get deploy rfs-addon-redis -n default -o json |jq '.status.replicas')
+    READY=$(kubectl get deploy rfs-addon-redis -n default -o json | jq '.status.readyReplicas')
     if [ "$REPLICAS" != "$READY" ]; then
       report-status --name=check_redis_sential --status=error --message="redis sentail ready pod not statisfied expect"
       return 1
@@ -25,8 +25,8 @@ function sential_detect() {
 
 function redis_detect() {
     ## redis ready pod detect
-    REPLICAS=$(kubectl get sts rfr-addon-redis -n default -o yaml | grep ' replicas' | awk '{if (NR > 1){print $2}}')
-    READY=$(kubectl get sts rfr-addon-redis -n default -o yaml | grep readyReplicas | awk '{print $2}')
+    REPLICAS=$(kubectl get sts rfr-addon-redis -n default -o json |jq '.status.replicas')
+    READY=$(kubectl get sts rfr-addon-redis -n default -o json | jq '.status.readyReplicas')
     if [ "$REPLICAS" != "$READY" ]; then
         report-status --name=check_redis --status=error --message="redis ready pod not statisfied expect"
         return 1
@@ -82,4 +82,4 @@ if kubectl get cm dice-cluster-info -n default -o yaml | grep DICE_IS_EDGE: | gr
 		sential_detect
 		redis_detect
 	fi
-fi
+fi