Merge branch 'main' of https://github.com/jembi/platform into PLAT-400-cluster-clikhouse

Author: nour-borgi

message-bus-kafka/swarm.sh

@@ -42,9 +42,9 @@ if [[ "${ACTION}" == "init" ]] || [[ "${ACTION}" == "up" ]]; then
   config::remove_config_importer message-bus-kafka-config-importer
 
   if [ "$STATEFUL_NODES" == "cluster" ]; then
-    docker::deploy_sanity openhim-core kafka kafdrop kafka-minion zookeeper-1 zookeeper-2 zookeeper-3
+    docker::deploy_sanity kafka kafdrop kafka-minion zookeeper-1 zookeeper-2 zookeeper-3
   else
-    docker::deploy_sanity openhim-core kafka kafdrop kafka-minion zookeeper-1
+    docker::deploy_sanity kafka kafdrop kafka-minion zookeeper-1
   fi
 elif [[ "${ACTION}" == "down" ]]; then
   try "docker service scale instant_zookeeper-1=0 instant_kafdrop=0 instant_kafka-minion=0" "Failed to scale down zookeeper, kafdrop and kafka-minion"

reverse-proxy-nginx/swarm.sh

@@ -21,12 +21,11 @@ ROOT_PATH="${COMPOSE_FILE_PATH}/.."
 . "${ROOT_PATH}/utils/config-utils.sh"
 
 main() {
+  if [[ "${MODE}" == "dev" ]]; then
+    log info "Not including reverse proxy as we are running DEV mode"
+    exit 0
+  fi
   if [[ "${ACTION}" == "init" ]] || [[ "${ACTION}" == "up" ]]; then
-    if [[ "${MODE}" == "dev" ]]; then
-      log info "Not starting reverse proxy as we are running DEV mode"
-      exit 0
-    fi
-
     if [[ "${INSECURE}" == "true" ]]; then
       log info "Running reverse-proxy package in INSECURE mode"