From 155042343b40c94507af61d0cbc7598dfed995a0 Mon Sep 17 00:00:00 2001
From: Alexander Chuprov <a.chuprov@yadro.com>
Date: Sat, 17 Aug 2024 06:25:11 +0300
Subject: [PATCH] [#69] service/storage: Add support -q flag in healthcheck

Signed-off-by: Alexander Chuprov <a.chuprov@yadro.com>
---
 services/storage/docker-compose.yml | 12 ++++--------
 services/storage/healthcheck.sh     |  5 -----
 2 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100755 services/storage/healthcheck.sh

diff --git a/services/storage/docker-compose.yml b/services/storage/docker-compose.yml
index 8a8698e..fb10974 100644
--- a/services/storage/docker-compose.yml
+++ b/services/storage/docker-compose.yml
@@ -17,7 +17,6 @@ services:
       - storage_s01:/storage
       - ./../../vendor/frostfs-cli:/frostfs-cli
       - ./cli-cfg.yml:/cli-cfg.yml
-      - ./healthcheck.sh:/healthcheck.sh
       - ./s04tls.crt:/etc/ssl/certs/s04tls.crt
       - ../nats/client-cert.pem:/etc/frostfs-node/nats.tls.cert
       - ../nats/client-key.pem:/etc/frostfs-node/nats.tls.key
@@ -36,7 +35,7 @@ services:
       - FROSTFS_NODE_ATTRIBUTE_1=UN-LOCODE:RU MOW
       - FROSTFS_NODE_ATTRIBUTE_2=Price:22
     healthcheck:
-      test: ["CMD-SHELL", "/healthcheck.sh"]
+      test: ["CMD-SHELL", "/frostfs-cli control healthcheck -q -c /cli-cfg.yml --endpoint \"$$FROSTFS_CONTROL_GRPC_ENDPOINT\""]
       interval: 2s
       timeout: 1s
       retries: 5
@@ -58,7 +57,6 @@ services:
       - storage_s02:/storage
       - ./../../vendor/frostfs-cli:/frostfs-cli
       - ./cli-cfg.yml:/cli-cfg.yml
-      - ./healthcheck.sh:/healthcheck.sh
       - ./s04tls.crt:/etc/ssl/certs/s04tls.crt
       - ../nats/client-cert.pem:/etc/frostfs-node/nats.tls.cert
       - ../nats/client-key.pem:/etc/frostfs-node/nats.tls.key
@@ -77,7 +75,7 @@ services:
       - FROSTFS_NODE_ATTRIBUTE_1=UN-LOCODE:RU LED
       - FROSTFS_NODE_ATTRIBUTE_2=Price:33
     healthcheck:
-      test: ["CMD-SHELL", "/healthcheck.sh"]
+      test: ["CMD-SHELL", "/frostfs-cli control healthcheck -q -c /cli-cfg.yml --endpoint \"$$FROSTFS_CONTROL_GRPC_ENDPOINT\""]
       interval: 2s
       timeout: 1s
       retries: 5
@@ -99,7 +97,6 @@ services:
       - storage_s03:/storage
       - ./../../vendor/frostfs-cli:/frostfs-cli
       - ./cli-cfg.yml:/cli-cfg.yml
-      - ./healthcheck.sh:/healthcheck.sh
       - ./s04tls.crt:/etc/ssl/certs/s04tls.crt
       - ../nats/client-cert.pem:/etc/frostfs-node/nats.tls.cert
       - ../nats/client-key.pem:/etc/frostfs-node/nats.tls.key
@@ -118,7 +115,7 @@ services:
       - FROSTFS_NODE_ATTRIBUTE_1=UN-LOCODE:SE STO
       - FROSTFS_NODE_ATTRIBUTE_2=Price:11
     healthcheck:
-      test: ["CMD-SHELL", "/healthcheck.sh"]
+      test: ["CMD-SHELL", "/frostfs-cli control healthcheck -q -c /cli-cfg.yml --endpoint \"$$FROSTFS_CONTROL_GRPC_ENDPOINT\""]
       interval: 2s
       timeout: 1s
       retries: 5
@@ -140,7 +137,6 @@ services:
       - storage_s04:/storage
       - ./../../vendor/frostfs-cli:/frostfs-cli
       - ./cli-cfg.yml:/cli-cfg.yml
-      - ./healthcheck.sh:/healthcheck.sh
       - ./s04tls.crt:/tls.crt
       - ./s04tls.key:/tls.key
       - ../nats/client-cert.pem:/etc/frostfs-node/nats.tls.cert
@@ -165,7 +161,7 @@ services:
       - FROSTFS_NODE_ATTRIBUTE_1=UN-LOCODE:FI HEL
       - FROSTFS_NODE_ATTRIBUTE_2=Price:44
     healthcheck:
-      test: ["CMD-SHELL", "/healthcheck.sh"]
+      test: ["CMD-SHELL", "/frostfs-cli control healthcheck -q -c /cli-cfg.yml --endpoint \"$$FROSTFS_CONTROL_GRPC_ENDPOINT\""]
       interval: 2s
       timeout: 1s
       retries: 5
diff --git a/services/storage/healthcheck.sh b/services/storage/healthcheck.sh
deleted file mode 100755
index 792d2ad..0000000
--- a/services/storage/healthcheck.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-/frostfs-cli control healthcheck -c /cli-cfg.yml \
-	--endpoint "$FROSTFS_CONTROL_GRPC_ENDPOINT" |
-	grep "Health status: READY"