Merge pull request #104 from jembi/PLAT-366-remove-default-replicas

Mark-Labuschagne · web-flow · commit 5cd16d03144e · 2022-07-20T15:37:38.000+02:00
Remove default replicas
diff --git a/client-registry-santempi/docker-compose.yml b/client-registry-santempi/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       - SDB_DATA_POLICY_RESOURCE=Patient
       - SDB_DELAY_START=5000
     deploy:
-      replicas: ${SANTEMPI_INSTANCES:-1}
+      replicas: ${SANTEMPI_INSTANCES}
   santedb-www:
     image: santesuite/santedb-www:2.2.3
     depends_on:
diff --git a/client-registry-santempi/package-metadata.json b/client-registry-santempi/package-metadata.json
@@ -4,5 +4,7 @@
   "description": "A patient matching and deduplicater for the platform",
   "version": "0.0.1",
   "dependencies": ["reverse-proxy-nginx"],
-  "environmentVariables": {}
+  "environmentVariables": {
+    "SANTEMPI_INSTANCES": "1"
+  }
 }
diff --git a/client-registry-santempi/swarm.sh b/client-registry-santempi/swarm.sh
@@ -2,7 +2,8 @@
 
 readonly ACTION=$1
 readonly MODE=$2
-
+readonly SANTEMPI_INSTANCES=${SANTEMPI_INSTANCES:-1}
+export SANTEMPI_INSTANCES
 TIMESTAMP="$(date "+%Y%m%d%H%M%S")"
 readonly TIMESTAMP
 
diff --git a/dashboard-visualiser-jsreport/docker-compose.yml b/dashboard-visualiser-jsreport/docker-compose.yml
@@ -6,7 +6,7 @@ services:
     deploy:
       placement:
         max_replicas_per_node: 1
-      replicas: ${JS_REPORT_INSTANCES:-1}
+      replicas: ${JS_REPORT_INSTANCES}
       resources:
         limits:
           cpus: ${JS_REPORT_CPU_LIMIT:-0.8}
diff --git a/dashboard-visualiser-jsreport/package-metadata.json b/dashboard-visualiser-jsreport/package-metadata.json
@@ -17,6 +17,7 @@
     "JS_REPORT_CPU_RESERVE": "0.05",
     "JS_REPORT_MEMORY_RESERVE": "500M",
     "JS_REPORT_DEV_MOUNT": "false",
-    "JS_REPORT_PACKAGE_PATH": ""
+    "JS_REPORT_PACKAGE_PATH": "",
+    "JS_REPORT_INSTANCES": "1"
   }
 }
diff --git a/dashboard-visualiser-jsreport/swarm.sh b/dashboard-visualiser-jsreport/swarm.sh
@@ -2,6 +2,10 @@
 
 readonly ACTION=$1
 readonly MODE=$2
+readonly JS_REPORT_INSTANCES=${JS_REPORT_INSTANCES:-1}
+export JS_REPORT_INSTANCES
+TIMESTAMP="$(date "+%Y%m%d%H%M%S")"
+readonly TIMESTAMP
 
 STATEFUL_NODES=${STATEFUL_NODES:-"cluster"}
 
diff --git a/dashboard-visualiser-kibana/docker-compose.yml b/dashboard-visualiser-kibana/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     environment:
       ES_KIBANA_SYSTEM: ${ES_KIBANA_SYSTEM?:err}
     deploy:
-      replicas: ${KIBANA_INSTANCES:-1}
+      replicas: ${KIBANA_INSTANCES}
       resources:
         limits:
           memory: ${KIBANA_MEMORY_LIMIT:-3G}
diff --git a/dashboard-visualiser-kibana/swarm.sh b/dashboard-visualiser-kibana/swarm.sh
@@ -2,6 +2,8 @@
 
 readonly ACTION=$1
 readonly MODE=$2
+readonly KIBANA_INSTANCES=${KIBANA_INSTANCES:-1}
+export KIBANA_INSTANCES
 
 readonly STATEFUL_NODES=${STATEFUL_NODES:-"cluster"}
 
diff --git a/fhir-datastore-hapi-fhir/docker-compose.yml b/fhir-datastore-hapi-fhir/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       - JAVA_TOOL_OPTIONS=-Xmx2g
       - CATALINA_OPTS=-Xmx2g
     deploy:
-      replicas: ${HAPI_FHIR_INSTANCES:-1}
+      replicas: ${HAPI_FHIR_INSTANCES}
       resources:
         limits:
           cpus: ${HAPI_FHIR_CPU_LIMIT:-0.8}
diff --git a/fhir-datastore-hapi-fhir/package-metadata.json b/fhir-datastore-hapi-fhir/package-metadata.json
@@ -13,6 +13,7 @@
     "HF_POSTGRES_CPU_LIMIT": "0.8",
     "HF_POSTGRES_CPU_RESERVE": "0.05",
     "HF_POSTGRES_MEMORY_LIMIT": "3G",
-    "HF_POSTGRES_MEMORY_RESERVE": "500M"
+    "HF_POSTGRES_MEMORY_RESERVE": "500M",
+    "HAPI_FHIR_INSTANCES": "1"
   }
 }
diff --git a/fhir-datastore-hapi-fhir/swarm.sh b/fhir-datastore-hapi-fhir/swarm.sh
@@ -4,7 +4,8 @@
 readonly ACTION=$1
 readonly MODE=$2
 readonly STATEFUL_NODES=${STATEFUL_NODES:-"cluster"}
-
+readonly HAPI_FHIR_INSTANCES=${HAPI_FHIR_INSTANCES:-1}
+export HAPI_FHIR_INSTANCES
 COMPOSE_FILE_PATH=$(
   cd "$(dirname "${BASH_SOURCE[0]}")" || exit
   pwd -P
diff --git a/interoperability-layer-openhim/docker-compose.stack-0.yml b/interoperability-layer-openhim/docker-compose.stack-0.yml
@@ -3,7 +3,7 @@ version: '3.9'
 services:
   openhim-core:
     deploy:
-      replicas: ${OPENHIM_CORE_INSTANCES:-1}
+      replicas: ${OPENHIM_CORE_INSTANCES}
 
   openhim-console:
     deploy:
diff --git a/interoperability-layer-openhim/docker-compose.stack-1.yml b/interoperability-layer-openhim/docker-compose.stack-1.yml
@@ -3,8 +3,8 @@ version: '3.9'
 services:
   openhim-core:
     deploy:
-      replicas: ${OPENHIM_CORE_INSTANCES:-1}
+      replicas: ${OPENHIM_CORE_INSTANCES}
 
   openhim-console:
     deploy:
-      replicas: ${OPENHIM_CONSOLE_INSTANCES:-1}
+      replicas: ${OPENHIM_CONSOLE_INSTANCES}
diff --git a/interoperability-layer-openhim/package-metadata.json b/interoperability-layer-openhim/package-metadata.json
@@ -8,6 +8,7 @@
     "OPENHIM_MEDIATOR_API_PORT": "8080",
     "MONGO_SET_COUNT": "1",
     "OPENHIM_CORE_INSTANCES": "1",
+    "OPENHIM_CONSOLE_INSTANCES": "1",
     "OPENHIM_CORE_MEDIATOR_HOSTNAME": "localhost",
     "OPENHIM_CPU_LIMIT": "0.8",
     "OPENHIM_CPU_RESERVE": "0.05",
diff --git a/interoperability-layer-openhim/swarm.sh b/interoperability-layer-openhim/swarm.sh
@@ -7,6 +7,9 @@ readonly STATEFUL_NODES=${STATEFUL_NODES:-"cluster"}
 readonly OPENHIM_CORE_MEDIATOR_HOSTNAME=${OPENHIM_CORE_MEDIATOR_HOSTNAME:-"localhost"}
 readonly OPENHIM_MEDIATOR_API_PORT=${OPENHIM_MEDIATOR_API_PORT:-"8080"}
 readonly OPENHIM_CORE_INSTANCES=${OPENHIM_CORE_INSTANCES:-1}
+readonly OPENHIM_CONSOLE_INSTANCES=${OPENHIM_CONSOLE_INSTANCES:-1}
+export OPENHIM_CORE_INSTANCES
+export OPENHIM_CONSOLE_INSTANCES
 readonly MONGO_SET_COUNT=${MONGO_SET_COUNT:-3}
 
 COMPOSE_FILE_PATH=$(
diff --git a/message-bus-helper-hapi-proxy/docker-compose.yml b/message-bus-helper-hapi-proxy/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       KAFKA_BOOTSTRAP_SERVERS: ${KAFKA_BOOTSTRAP_SERVERS:-kafka:9092}
       HAPI_SERVER_VALIDATE_FORMAT: ${HAPI_SERVER_VALIDATE_FORMAT:-NONE}
     deploy:
-      replicas: ${HAPI_PROXY_INSTANCES:-1}
+      replicas: ${HAPI_PROXY_INSTANCES}
       resources:
         limits:
           cpus: ${HAPI_PROXY_CPU_LIMIT:-0.8}
diff --git a/message-bus-helper-hapi-proxy/swarm.sh b/message-bus-helper-hapi-proxy/swarm.sh
@@ -2,7 +2,8 @@
 
 readonly ACTION=$1
 readonly MODE=$2
-
+readonly HAPI_PROXY_INSTANCES=${HAPI_PROXY_INSTANCES:-1}
+export HAPI_PROXY_INSTANCES
 COMPOSE_FILE_PATH=$(
   cd "$(dirname "${BASH_SOURCE[0]}")" || exit
   pwd -P
diff --git a/reverse-proxy-nginx/docker-compose.yml b/reverse-proxy-nginx/docker-compose.yml
@@ -5,7 +5,7 @@ services:
   reverse-proxy-nginx:
     image: nginx:stable
     deploy:
-      replicas: ${REVERSE_PROXY_INSTANCES:-1}
+      replicas: ${REVERSE_PROXY_INSTANCES}
       placement:
         max_replicas_per_node: 1
       resources:
diff --git a/reverse-proxy-nginx/package-metadata.json b/reverse-proxy-nginx/package-metadata.json
@@ -9,6 +9,7 @@
     "NGINX_CPU_LIMIT": "0.8",
     "NGINX_CPU_RESERVE": "0.05",
     "NGINX_MEMORY_LIMIT": "3G",
-    "NGINX_MEMORY_RESERVE": "500M"
+    "NGINX_MEMORY_RESERVE": "500M",
+    "REVERSE_PROXY_INSTANCES": "1"
   }
 }
diff --git a/reverse-proxy-nginx/swarm.sh b/reverse-proxy-nginx/swarm.sh
@@ -3,6 +3,8 @@
 # Constants
 readonly ACTION=$1
 readonly MODE=$2
+readonly REVERSE_PROXY_INSTANCES=${REVERSE_PROXY_INSTANCES:-1}
+export REVERSE_PROXY_INSTANCES
 COMPOSE_FILE_PATH=$(
   cd "$(dirname "${BASH_SOURCE[0]}")" || exit
   pwd -P

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,7 @@`
`4`	`4`	`"description": "A patient matching and deduplicater for the platform",`
`5`	`5`	`"version": "0.0.1",`
`6`	`6`	`"dependencies": ["reverse-proxy-nginx"],`
`7`		`- "environmentVariables": {}`
	`7`	`+ "environmentVariables": {`
	`8`	`+ "SANTEMPI_INSTANCES": "1"`
	`9`	`+ }`
`8`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`"JS_REPORT_CPU_RESERVE": "0.05",`
`18`	`18`	`"JS_REPORT_MEMORY_RESERVE": "500M",`
`19`	`19`	`"JS_REPORT_DEV_MOUNT": "false",`
`20`		`- "JS_REPORT_PACKAGE_PATH": ""`
	`20`	`+ "JS_REPORT_PACKAGE_PATH": "",`
	`21`	`+ "JS_REPORT_INSTANCES": "1"`
`21`	`22`	`}`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`"HF_POSTGRES_CPU_LIMIT": "0.8",`
`14`	`14`	`"HF_POSTGRES_CPU_RESERVE": "0.05",`
`15`	`15`	`"HF_POSTGRES_MEMORY_LIMIT": "3G",`
`16`		`- "HF_POSTGRES_MEMORY_RESERVE": "500M"`
	`16`	`+ "HF_POSTGRES_MEMORY_RESERVE": "500M",`
	`17`	`+ "HAPI_FHIR_INSTANCES": "1"`
`17`	`18`	`}`
`18`	`19`	`}`