Merge pull request #2927 from w3f/master

sync

Author: ironoa

.github/dependabot.yml

@@ -2,6 +2,7 @@ version: 2
 updates:
 - package-ecosystem: npm
   directory: "/"
+  target-branch: "staging"
   schedule:
     interval: daily
   open-pull-requests-limit: 10
@@ -13,6 +14,7 @@ updates:
 
 - package-ecosystem: docker
   directory: "/"
+  target-branch: "staging"
   schedule:
     interval: daily
   open-pull-requests-limit: 10     

apps/1kv-backend-staging/templates/kusama-otv-backend.yaml

@@ -62,9 +62,9 @@ spec:
                   "commission": 150000000,
                   "unclaimedEraThreshold": 4,
                   "sanctionedGeoArea": {
-                    "skip": true,
-                    "sanctionedCountries": ["XXX"],
-                    "sanctionedRegions": ["XXX" ]
+                    "skip": false,
+                    "sanctionedCountries": ["RU", "IR", "CU", "KP", "SY"],
+                    "sanctionedRegions": ["Crimea", "Autonomous Republic of Crimea", "Republic of Crimea", "Luhansk", "Luhanska Oblast", "Luhanska", "Luganskaya Oblast’", "Luganskaya", "Donetsk", "Donetska Oblast", "Donetskaya Oblast’", "Donetska", "Donetskaya", "Sevastopol City", "Sevastopol", "Gorod Sevastopol"]
                   },
                   "forceClientVersion": "v1.10.0"
                 },

apps/1kv-backend-staging/templates/polkadot-otv-backend.yaml

@@ -61,9 +61,9 @@ spec:
                   "commission": 50000000,
                   "unclaimedEraThreshold": 1,
                   "sanctionedGeoArea": {
-                    "skip": true,
-                    "sanctionedCountries": ["XXX"],
-                    "sanctionedRegions": ["XXX" ]
+                    "skip": false,
+                    "sanctionedCountries": ["RU", "IR", "CU", "KP", "SY"],
+                    "sanctionedRegions": ["Crimea", "Autonomous Republic of Crimea", "Republic of Crimea", "Luhansk", "Luhanska Oblast", "Luhanska", "Luganskaya Oblast’", "Luganskaya", "Donetsk", "Donetska Oblast", "Donetskaya Oblast’", "Donetska", "Donetskaya", "Sevastopol City", "Sevastopol", "Gorod Sevastopol"]
                   },
                   "forceClientVersion": "v1.10.0"
                 },

apps/1kv-backend/templates/kusama-otv-backend.yaml

@@ -60,9 +60,9 @@ spec:
                   "commission": 150000000,
                   "unclaimedEraThreshold": 4,
                   "sanctionedGeoArea": {
-                    "skip": true,
-                    "sanctionedCountries": ["XXX"],
-                    "sanctionedRegions": ["XXX" ]
+                    "skip": false,
+                    "sanctionedCountries": ["RU", "IR", "CU", "KP", "SY"],
+                    "sanctionedRegions": ["Crimea", "Autonomous Republic of Crimea", "Republic of Crimea", "Luhansk", "Luhanska Oblast", "Luhanska", "Luganskaya Oblast’", "Luganskaya", "Donetsk", "Donetska Oblast", "Donetskaya Oblast’", "Donetska", "Donetskaya", "Sevastopol City", "Sevastopol", "Gorod Sevastopol"]
                   },
                   "forceClientVersion": "v1.10.0"
                 },

apps/1kv-backend/templates/polkadot-otv-backend.yaml

@@ -59,9 +59,9 @@ spec:
                   "commission": 50000000,
                   "unclaimedEraThreshold": 1,
                   "sanctionedGeoArea": {
-                    "skip": true,
-                    "sanctionedCountries": ["XXX"],
-                    "sanctionedRegions": ["XXX" ]
+                    "skip": false,
+                    "sanctionedCountries": ["RU", "IR", "CU", "KP", "SY"],
+                    "sanctionedRegions": ["Crimea", "Autonomous Republic of Crimea", "Republic of Crimea", "Luhansk", "Luhanska Oblast", "Luhanska", "Luganskaya Oblast’", "Luganskaya", "Donetsk", "Donetska Oblast", "Donetskaya Oblast’", "Donetska", "Donetskaya", "Sevastopol City", "Sevastopol", "Gorod Sevastopol"]
                   },
                   "forceClientVersion": "v1.10.0"
                 },

apps/1kv-backend/templates/restarter.yaml

@@ -22,7 +22,7 @@ spec:
       env:
         - name: HELM_VALUES
           value: |
-            schedule: "0 12 * * *"
+            schedule: "0 */6 * * *"
 
 --- 
 
@@ -50,4 +50,4 @@ spec:
       env:
         - name: HELM_VALUES
           value: |
-            schedule: "0 12 * * *"
+            schedule: "0 */6 * * *"

apps/1kv-backend/values.yaml

@@ -7,7 +7,7 @@ kusama:
     secret:  <path:vaults/k8s-community-secrets/items/otv-kusama#backend-secret>
     domain: kusama.w3f.community
     matrix:   
-      room: "!mdugGIKqSTweIOpTlA:web3.foundation"
+      room: "!NPPsWrRlXjfgWsVFiJ:web3.foundation"
       userId: "@1kvbot:web3.foundation"
     storage: "20Gi"
     resources:
@@ -28,7 +28,7 @@ polkadot:
     secret:  <path:vaults/k8s-community-secrets/items/otv-polkadot#backend-secret>
     domain: polkadot.w3f.community
     matrix:   
-      room: "!ccXWsugXuoiHnkEhKa:web3.foundation"
+      room: "!JKVQoCWEnKxeWOPsYR:web3.foundation"
       userId: "@1kvbot:web3.foundation"
     storage: "20Gi"
     resources: