Merge pull request #128 from worldcoin/fix-global-variables

fix: move envs to separate files

deploy/stage/common-values-gpu-iris-mpc.yaml

@@ -53,64 +53,3 @@ tolerations:
     operator: "Equal"
     value: "gpuGroup"
     effect: "NoSchedule"
-
-env:
-  - name: SMPC__ENVIRONMENT
-    value: "stage"
-
-  - name: SMPC__SERVICE__SERVICE_NAME
-    value: "smpcv2-server"
-
-  - name: SMPC__DATABASE__URL
-    valueFrom:
-      secretKeyRef:
-        key: DATABASE_URL
-        name: application
-
-  - name: SMPC__DATABASE__MIGRATE
-    value: "true"
-
-  - name: SMPC__DATABASE__CREATE
-    value: "true"
-
-  - name: SMPC__AWS__REGION
-    value: "eu-north-1"
-
-  - name: SMPC__SERVERS__CODES_ENGINE_PORT
-    value: "4000"
-
-  - name: SMPC__SERVERS__MASKS_ENGINE_PORT
-    value: "4001"
-
-  - name: SMPC__SERVERS__BATCH_CODES_ENGINE_PORT
-    value: "4002"
-
-  - name: SMPC__SERVERS__BATCH_MASKS_ENGINE_PORT
-    value: "4003"
-
-  - name: SMPC__SERVERS__PHASE_2_BATCH_PORT
-    value: "4004"
-
-  - name: SMPC__SERVERS__PHASE_2_PORT
-    value: "4005"
-
-  - name: SMPC__REQUESTS_QUEUE_URL
-    valueFrom:
-      secretKeyRef:
-        key: SQS_URL
-        name: application
-
-  - name: SMPC__RESULTS_TOPIC_ARN
-    valueFrom:
-      secretKeyRef:
-        key: SNS_RESULTS_ARN
-        name: application
-
-  - name: SMPC__PATH
-    value: "/data/"
-
-  - name: SMPC__KMS_KEY_IDS
-    valueFrom:
-      secretKeyRef:
-        key: KMS_KEYS
-        name: application

deploy/stage/mpc1-stage/values-gpu-iris-mpc.yaml

@@ -1,3 +1,63 @@
 env:
+  - name: SMPC__ENVIRONMENT
+    value: "stage"
+
+  - name: SMPC__SERVICE__SERVICE_NAME
+    value: "smpcv2-server"
+
+  - name: SMPC__DATABASE__URL
+    valueFrom:
+      secretKeyRef:
+        key: DATABASE_URL
+        name: application
+
+  - name: SMPC__DATABASE__MIGRATE
+    value: "true"
+
+  - name: SMPC__DATABASE__CREATE
+    value: "true"
+
+  - name: SMPC__AWS__REGION
+    value: "eu-north-1"
+
+  - name: SMPC__SERVERS__CODES_ENGINE_PORT
+    value: "4000"
+
+  - name: SMPC__SERVERS__MASKS_ENGINE_PORT
+    value: "4001"
+
+  - name: SMPC__SERVERS__BATCH_CODES_ENGINE_PORT
+    value: "4002"
+
+  - name: SMPC__SERVERS__BATCH_MASKS_ENGINE_PORT
+    value: "4003"
+
+  - name: SMPC__SERVERS__PHASE_2_BATCH_PORT
+    value: "4004"
+
+  - name: SMPC__SERVERS__PHASE_2_PORT
+    value: "4005"
+
+  - name: SMPC__REQUESTS_QUEUE_URL
+    valueFrom:
+      secretKeyRef:
+        key: SQS_URL
+        name: application
+
+  - name: SMPC__RESULTS_TOPIC_ARN
+    valueFrom:
+      secretKeyRef:
+        key: SNS_RESULTS_ARN
+        name: application
+
+  - name: SMPC__PATH
+    value: "/data/"
+
+  - name: SMPC__KMS_KEY_IDS
+    valueFrom:
+      secretKeyRef:
+        key: KMS_KEYS
+        name: application
+
   - name: SMPC__PARTY_ID
     value: "0"

deploy/stage/mpc2-stage/values-gpu-iris-mpc.yaml

@@ -1,3 +1,63 @@
 env:
+  - name: SMPC__ENVIRONMENT
+    value: "stage"
+
+  - name: SMPC__SERVICE__SERVICE_NAME
+    value: "smpcv2-server"
+
+  - name: SMPC__DATABASE__URL
+    valueFrom:
+      secretKeyRef:
+        key: DATABASE_URL
+        name: application
+
+  - name: SMPC__DATABASE__MIGRATE
+    value: "true"
+
+  - name: SMPC__DATABASE__CREATE
+    value: "true"
+
+  - name: SMPC__AWS__REGION
+    value: "eu-north-1"
+
+  - name: SMPC__SERVERS__CODES_ENGINE_PORT
+    value: "4000"
+
+  - name: SMPC__SERVERS__MASKS_ENGINE_PORT
+    value: "4001"
+
+  - name: SMPC__SERVERS__BATCH_CODES_ENGINE_PORT
+    value: "4002"
+
+  - name: SMPC__SERVERS__BATCH_MASKS_ENGINE_PORT
+    value: "4003"
+
+  - name: SMPC__SERVERS__PHASE_2_BATCH_PORT
+    value: "4004"
+
+  - name: SMPC__SERVERS__PHASE_2_PORT
+    value: "4005"
+
+  - name: SMPC__REQUESTS_QUEUE_URL
+    valueFrom:
+      secretKeyRef:
+        key: SQS_URL
+        name: application
+
+  - name: SMPC__RESULTS_TOPIC_ARN
+    valueFrom:
+      secretKeyRef:
+        key: SNS_RESULTS_ARN
+        name: application
+
+  - name: SMPC__PATH
+    value: "/data/"
+
+  - name: SMPC__KMS_KEY_IDS
+    valueFrom:
+      secretKeyRef:
+        key: KMS_KEYS
+        name: application
+
   - name: SMPC__PARTY_ID
     value: "1"

deploy/stage/mpc3-stage/values-gpu-iris-mpc.yaml

@@ -1,3 +1,63 @@
 env:
+  - name: SMPC__ENVIRONMENT
+    value: "stage"
+
+  - name: SMPC__SERVICE__SERVICE_NAME
+    value: "smpcv2-server"
+
+  - name: SMPC__DATABASE__URL
+    valueFrom:
+      secretKeyRef:
+        key: DATABASE_URL
+        name: application
+
+  - name: SMPC__DATABASE__MIGRATE
+    value: "true"
+
+  - name: SMPC__DATABASE__CREATE
+    value: "true"
+
+  - name: SMPC__AWS__REGION
+    value: "eu-north-1"
+
+  - name: SMPC__SERVERS__CODES_ENGINE_PORT
+    value: "4000"
+
+  - name: SMPC__SERVERS__MASKS_ENGINE_PORT
+    value: "4001"
+
+  - name: SMPC__SERVERS__BATCH_CODES_ENGINE_PORT
+    value: "4002"
+
+  - name: SMPC__SERVERS__BATCH_MASKS_ENGINE_PORT
+    value: "4003"
+
+  - name: SMPC__SERVERS__PHASE_2_BATCH_PORT
+    value: "4004"
+
+  - name: SMPC__SERVERS__PHASE_2_PORT
+    value: "4005"
+
+  - name: SMPC__REQUESTS_QUEUE_URL
+    valueFrom:
+      secretKeyRef:
+        key: SQS_URL
+        name: application
+
+  - name: SMPC__RESULTS_TOPIC_ARN
+    valueFrom:
+      secretKeyRef:
+        key: SNS_RESULTS_ARN
+        name: application
+
+  - name: SMPC__PATH
+    value: "/data/"
+
+  - name: SMPC__KMS_KEY_IDS
+    valueFrom:
+      secretKeyRef:
+        key: KMS_KEYS
+        name: application
+
   - name: SMPC__PARTY_ID
     value: "2"