Merge branch 'main' into develop

helium · Dec 19, 2023 · 3b88dc1 · 3b88dc1
2 parents 2144af0 + e9f2bdb
commit 3b88dc1
Show file tree

Hide file tree

Showing 14 changed files with 63 additions and 16 deletions.
diff --git a/manifests/oracle-cluster/prod/helium/iot-oracle.yaml b/manifests/oracle-cluster/prod/helium/iot-oracle.yaml
@@ -18,7 +18,7 @@ spec:
       serviceAccountName: rds-iot-oracle-user-access
       containers:
         - name: iot-oracle
-          image: public.ecr.aws/s2o4r1i6/distributor-oracle:0.0.50
+          image: public.ecr.aws/s2o4r1i6/distributor-oracle:0.0.52
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
@@ -93,6 +93,9 @@ kind: Service
 metadata:
   name: iot-oracle
   namespace: helium
+  annotations:
+    prometheus.io/scrape: "true"
+    prometheus.io/port: "8080"
 spec:
   ports:
     - port: 8080
@@ -149,4 +152,4 @@ spec:
         name: cpu
         target:
           type: Utilization
-          averageUtilization: 75
+          averageUtilization: 75
diff --git a/manifests/oracle-cluster/prod/helium/mobile-oracle.yaml b/manifests/oracle-cluster/prod/helium/mobile-oracle.yaml
@@ -18,7 +18,7 @@ spec:
       serviceAccountName: rds-mobile-oracle-user-access
       containers:
         - name: mobile-oracle
-          image: public.ecr.aws/s2o4r1i6/distributor-oracle:0.0.50
+          image: public.ecr.aws/s2o4r1i6/distributor-oracle:0.0.52
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
@@ -93,6 +93,9 @@ kind: Service
 metadata:
   name: mobile-oracle
   namespace: helium
+  annotations:
+    prometheus.io/scrape: "true"
+    prometheus.io/port: "8080"
 spec:
   ports:
     - port: 8080

diff --git a/manifests/oracle-cluster/sdlc/helium/iot-oracle.yaml b/manifests/oracle-cluster/sdlc/helium/iot-oracle.yaml
@@ -18,7 +18,7 @@ spec:
       serviceAccountName: rds-iot-oracle-user-access
       containers:
         - name: iot-oracle
-          image: public.ecr.aws/s2o4r1i6/distributor-oracle:0.0.50
+          image: public.ecr.aws/s2o4r1i6/distributor-oracle:0.0.52
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
@@ -93,6 +93,9 @@ kind: Service
 metadata:
   name: iot-oracle
   namespace: helium
+  annotations:
+    prometheus.io/scrape: "true"
+    prometheus.io/port: "8080"
 spec:
   ports:
     - port: 8080
@@ -149,4 +152,4 @@ spec:
         name: cpu
         target:
           type: Utilization
-          averageUtilization: 75
+          averageUtilization: 75
diff --git a/manifests/oracle-cluster/sdlc/helium/mobile-oracle.yaml b/manifests/oracle-cluster/sdlc/helium/mobile-oracle.yaml
@@ -18,7 +18,7 @@ spec:
       serviceAccountName: rds-mobile-oracle-user-access
       containers:
         - name: mobile-oracle
-          image: public.ecr.aws/s2o4r1i6/distributor-oracle:0.0.50
+          image: public.ecr.aws/s2o4r1i6/distributor-oracle:0.0.52
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
@@ -93,6 +93,9 @@ kind: Service
 metadata:
   name: mobile-oracle
   namespace: helium
+  annotations:
+    prometheus.io/scrape: "true"
+    prometheus.io/port: "8080"
 spec:
   ports:
     - port: 8080

diff --git a/manifests/web-cluster/prod/helium/account-postgres-sink-service.yaml b/manifests/web-cluster/prod/helium/account-postgres-sink-service.yaml
@@ -23,6 +23,9 @@ data:
           "accounts": [
             { "type": "PositionV0", "table": "positions", "schema": "public" },
             { "type": "Registrar", "table": "registrars", "schema": "public" }
+          ],
+          "crons": [
+            { "schedule": "5 */12 * * *", "type": "refresh-accounts" }
           ]
         },
         {
@@ -45,6 +48,9 @@ data:
               "table": "delegated_positions",
               "schema": "public"
             }
+          ],
+          "crons": [
+            { "schedule": "5 */12 * * *", "type": "refresh-accounts" }
           ]
         },
         {
@@ -127,7 +133,8 @@ data:
         "CREATE UNIQUE INDEX IF NOT EXISTS key_to_asset_asset_index ON key_to_assets(asset);",
         "CREATE UNIQUE INDEX IF NOT EXISTS key_to_asset_entity_key_index ON key_to_assets(entity_key);",
         "CREATE UNIQUE INDEX IF NOT EXISTS iot_hotspot_infos_asset_index ON iot_hotspot_infos(asset);",
-        "CREATE UNIQUE INDEX IF NOT EXISTS mobile_hotspot_infos_asset_index ON mobile_hotspot_infos(asset);"
+        "CREATE UNIQUE INDEX IF NOT EXISTS mobile_hotspot_infos_asset_index ON mobile_hotspot_infos(asset);",
+        "CREATE INDEX IF NOT EXISTS recipient_lazy_distributor_index ON recipients(lazy_distributor);"
       ]
     }
 ---

diff --git a/manifests/web-cluster/prod/helium/close-governance.yaml b/manifests/web-cluster/prod/helium/close-governance.yaml
@@ -19,7 +19,7 @@ spec:
           restartPolicy: OnFailure
           containers:
           - name: close-governance
-            image: public.ecr.aws/v0j6k5v6/crons:0.0.10
+            image: public.ecr.aws/v0j6k5v6/crons:0.0.11
             imagePullPolicy: IfNotPresent
             command: ["node", "/usr/src/app/lib/src/close-governance.js"]
             env:

diff --git a/manifests/web-cluster/prod/helium/end-epoch.yaml b/manifests/web-cluster/prod/helium/end-epoch.yaml
@@ -19,7 +19,7 @@ spec:
           restartPolicy: OnFailure
           containers:
           - name: end-epoch
-            image: public.ecr.aws/v0j6k5v6/crons:0.0.10
+            image: public.ecr.aws/v0j6k5v6/crons:0.0.11
             imagePullPolicy: IfNotPresent
             command: ["node", "/usr/src/app/lib/src/end-epoch.js"]
             env:

diff --git a/manifests/web-cluster/prod/helium/migration-service.yaml b/manifests/web-cluster/prod/helium/migration-service.yaml
@@ -18,7 +18,7 @@ spec:
       serviceAccountName: rds-web-user-access
       containers:
         - name: migration-service
-          image: public.ecr.aws/v0j6k5v6/migration-service:0.0.23
+          image: public.ecr.aws/v0j6k5v6/migration-service:0.0.27
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8081

diff --git a/manifests/web-cluster/prod/helium/solana-monitor.yaml b/manifests/web-cluster/prod/helium/solana-monitor.yaml
@@ -14,10 +14,12 @@ spec:
     metadata:
       labels:
         app: solana-monitor
+        security-group: public-rds-access
     spec:
+      serviceAccountName: public-monitoring-rds-read-replica-monitoring-user-access
       containers:
         - name: solana-monitor
-          image: public.ecr.aws/v0j6k5v6/solana-monitor:0.0.17
+          image: public.ecr.aws/v0j6k5v6/solana-monitor:0.0.21
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8082
@@ -49,6 +51,18 @@ spec:
                 secretKeyRef:
                   name: helius-rpc-url
                   key: secret
+            - name: PGHOST
+              value: monitoring-rds-read-replica.cbhihwhsofyu.us-west-2.rds.amazonaws.com
+            - name: PGPORT
+              value: "5432"
+            - name: PGUSER
+              value: monitoring
+            - name: AWS_REGION
+              value: us-west-2
+            - name: PGDATABASE
+              value: monitoring
+            - name: PGSSLMODE
+              value: no-verify
           readinessProbe:
             failureThreshold: 3
             httpGet:

diff --git a/manifests/web-cluster/prod/helium/vsr-metadata.yaml b/manifests/web-cluster/prod/helium/vsr-metadata.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: vsr-metadata
-          image: public.ecr.aws/v0j6k5v6/vsr-metadata-service:0.0.3
+          image: public.ecr.aws/v0j6k5v6/vsr-metadata-service:0.0.5
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8081

diff --git a/manifests/web-cluster/sdlc/helium/close-governance.yaml b/manifests/web-cluster/sdlc/helium/close-governance.yaml
@@ -19,7 +19,7 @@ spec:
           restartPolicy: OnFailure
           containers:
           - name: close-governance
-            image: public.ecr.aws/v0j6k5v6/crons:0.0.10
+            image: public.ecr.aws/v0j6k5v6/crons:0.0.11
             imagePullPolicy: IfNotPresent
             command: ["node", "/usr/src/app/lib/src/close-governance.js"]
             env:

diff --git a/manifests/web-cluster/sdlc/helium/end-epoch.yaml b/manifests/web-cluster/sdlc/helium/end-epoch.yaml
@@ -19,7 +19,7 @@ spec:
           restartPolicy: OnFailure
           containers:
           - name: end-epoch
-            image: public.ecr.aws/v0j6k5v6/crons:0.0.10
+            image: public.ecr.aws/v0j6k5v6/crons:0.0.11
             imagePullPolicy: IfNotPresent
             command: ["node", "/usr/src/app/lib/src/end-epoch.js"]
             env:

diff --git a/manifests/web-cluster/sdlc/helium/solana-monitor.yaml b/manifests/web-cluster/sdlc/helium/solana-monitor.yaml
@@ -14,10 +14,12 @@ spec:
     metadata:
       labels:
         app: solana-monitor
+        security-group: public-rds-access
     spec:
+      serviceAccountName: public-monitoring-rds-read-replica-monitoring-user-access
       containers:
         - name: solana-monitor
-          image: public.ecr.aws/v0j6k5v6/solana-monitor:0.0.17
+          image: public.ecr.aws/v0j6k5v6/solana-monitor:0.0.21
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8082
@@ -44,6 +46,18 @@ spec:
                 secretKeyRef:
                   name: helius-rpc-url
                   key: secret
+            - name: PGHOST
+              value: monitoring-rds-read-replica.cnigyps3bpgz.us-east-1.rds.amazonaws.com
+            - name: PGPORT
+              value: "5432"
+            - name: PGUSER
+              value: monitoring
+            - name: AWS_REGION
+              value: us-east-1
+            - name: PGDATABASE
+              value: monitoring
+            - name: PGSSLMODE
+              value: no-verify
           readinessProbe:
             failureThreshold: 3
             httpGet:

diff --git a/manifests/web-cluster/sdlc/helium/vsr-metadata.yaml b/manifests/web-cluster/sdlc/helium/vsr-metadata.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: vsr-metadata
-          image: public.ecr.aws/v0j6k5v6/vsr-metadata-service:0.0.3
+          image: public.ecr.aws/v0j6k5v6/vsr-metadata-service:0.0.5
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8081