updated

FalkorDB · Nov 21, 2024 · 11f045d · 11f045d
1 parent 15e5690
commit 11f045d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/.github/workflows/build-test-image.yaml b/.github/workflows/build-test-image.yaml
@@ -118,8 +118,8 @@ jobs:
           if [[ -n "$sec" ]];then
             mkdir -p secrets || { echo "Failed to create secrets directory"; exit 1; }
             echo '{{ $var.falkordbPassword }}' > ./secrets/falkordbpassword || { echo "Failed to write falkordbpassword"; exit 1; }
-            echo '{{ $var.falkordbPasswordSZReplica }}' > ./secrets/falkordbpasswordreplicaSZ || { echo "Failed to write falkordbpassword"; exit 1; }
-            echo '{{ $var.falkordbPasswordMZReplica }}' > ./secrets/falkordbpasswordreplicaMZ || { echo "Failed to write falkordbpassword"; exit 1; }
+            echo '{{ $var.falkordbPasswordSZReplica }}' > ./secrets/falkordbpasswordreplicasz || { echo "Failed to write falkordbpassword"; exit 1; }
+            echo '{{ $var.falkordbPasswordMZReplica }}' > ./secrets/falkordbpasswordreplicamz || { echo "Failed to write falkordbpassword"; exit 1; }
             echo '{{ $func.random(string, 16, $sys.deterministicSeedValue) }}' > ./secrets/adminpassword || { echo "Failed to write adminpassword"; exit 1; }
             echo '{{ $var.adminPassword }}' > ./secrets/grafana_admin_password || { echo "Failed to write grafana_admin_password"; exit 1; }
             echo '{{ $func.random(string, 16, $sys.deterministicSeedValue)  }}' > ./secrets/grafana_secret_key || { echo "Failed to write grafana_secret_key"; exit 1; }

diff --git a/falkordb-node/node-entrypoint.sh b/falkordb-node/node-entrypoint.sh
@@ -4,10 +4,10 @@ FALKORDB_USER=${FALKORDB_USER:-falkordb}
 #FALKORDB_PASSWORD=${FALKORDB_PASSWORD:-''}
 
 
-if [[ "$IS_MULTI_ZONE" == "0" ]]; then
-  SECRET_PATH="/run/secrets/falkordbpasswordreplicaSZ"
-elif [[ "$IS_MULTI_ZONE" == "1" ]];then
-  SECRET_PATH="/run/secrets/falkordbpasswordreplicaMZ"
+if [[ $HOSTNAME =~ node-sz-replica.* ]]; then
+  SECRET_PATH="/run/secrets/falkordbpasswordreplicasz"
+elif [[ $HOSTNAME =~ node-mz-replica.* ]];then
+  SECRET_PATH="/run/secrets/falkordbpasswordreplicamz"
 else
   SECRET_PATH="/run/secrets/falkordbpassword"
 fi
@@ -29,7 +29,7 @@ else
   export ADMIN_PASSWORD=''
 fi
 
-echo $ADMIN_PASSWORD
+
 RUN_SENTINEL=${RUN_SENTINEL:-0}
 RUN_NODE=${RUN_NODE:-1}
 RUN_METRICS=${RUN_METRICS:-1}

diff --git a/omnistrate.pro.yaml b/omnistrate.pro.yaml
@@ -923,13 +923,10 @@ services:
         description: Number of Replicas
         name: Number of Replicas
         type: Float64
-        modifiable: true
+        modifiable: false
         required: false
         export: true
         defaultValue: "2"
-        options:
-          - "2"
-          - "3"
       - key: enableTLS
         description: Whether to enable TLS for the database
         name: Enable TLS
@@ -1328,8 +1325,8 @@ services:
     secrets:
       - source: adminpasspath
         target: /run/secrets/adminpassword
-      - source: falkordbpassreplicapathSZ
-        target: /run/secrets/falkordbpasswordreplicaSZ
+      - source: falkordbpasspathreplicasz
+        target: /run/secrets/falkordbpasswordreplicasz
     environment:
       - RUN_NODE=1
       - RUN_SENTINEL=0
@@ -2138,8 +2135,8 @@ services:
     secrets:
       - source: adminpasspath
         target: /run/secrets/adminpassword
-      - source: falkordbpassreplicapathMZ
-        target: /run/secrets/falkordbpasswordreplicaMZ
+      - source: alkordbpasspathreplicamz
+        target: /run/secrets/falkordbpasswordreplicamz
     environment:
       - RUN_NODE=1
       - RUN_SENTINEL=0
@@ -2919,7 +2916,7 @@ secrets:
     file: ./secrets/adminpassword
   falkordbpasspath:
     file: ./secrets/falkordbpassword
-  falkordbpassreplicapathSZ:
-    file: ./secrets/falkordbpasswordreplicaSZ
-  falkordbpassreplicapathMZ:
-    file: ./secrets/falkordbpasswordreplicaMZ
+  falkordbpasspathreplicasz:
+    file: ./secrets/falkordbpasswordreplicasz
+  falkordbpasspathreplicamz:
+    file: ./secrets/falkordbpasswordreplicamz