build(repo): Update NATS dependency on chart

FuelLabs · Dec 18, 2024 · 9799573 · 9799573
1 parent a444792
commit 9799573
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 82 deletions.
diff --git a/cluster/charts/fuel-streams/Chart.lock b/cluster/charts/fuel-streams/Chart.lock
@@ -1,12 +1,12 @@
 dependencies:
 - name: nats
   repository: https://nats-io.github.io/k8s/helm/charts/
-  version: 1.2.6
+  version: 1.2.8
 - name: nats
   repository: https://nats-io.github.io/k8s/helm/charts/
-  version: 1.2.6
+  version: 1.2.8
 - name: nats
   repository: https://nats-io.github.io/k8s/helm/charts/
-  version: 1.2.6
-digest: sha256:ad7948ef2413ea2f9af239829570612f04abd624844413ad73600fd67ce2e9b6
-generated: "2024-12-08T20:11:41.144678-03:00"
+  version: 1.2.8
+digest: sha256:a5f3dd64e1a20f7c9d58894359f6f909f33d14772355ee70033fd411219bcc7e
+generated: "2024-12-18T16:59:13.903435-03:00"
diff --git a/cluster/charts/fuel-streams/Chart.yaml b/cluster/charts/fuel-streams/Chart.yaml
@@ -5,17 +5,17 @@ name: fuel-streams
 version: 0.5.6
 dependencies:
   - name: nats
-    version: 1.2.6
+    version: 1.2.8
     repository: https://nats-io.github.io/k8s/helm/charts/
     alias: nats-core
     condition: nats-core.enabled
   - name: nats
-    version: 1.2.6
+    version: 1.2.8
     repository: https://nats-io.github.io/k8s/helm/charts/
     alias: nats-publisher
     condition: nats-publisher.enabled
   - name: nats
-    version: 1.2.6
+    version: 1.2.8
     repository: https://nats-io.github.io/k8s/helm/charts/
     alias: nats-client
     condition: nats-client.enabled
diff --git a/cluster/charts/fuel-streams/values-local.yaml b/cluster/charts/fuel-streams/values-local.yaml
@@ -6,8 +6,8 @@ config:
 publisher:
   storage:
     size: 10Gi
-    storageClass: "standard"  # Use default storage class
-  
+    storageClass: "standard" # Use default storage class
+
   config:
     replicaCount: 1
     resources:
@@ -50,7 +50,7 @@ nats-core:
 
   config:
     cluster:
-      replicas: 1  # Single replica for local development
+      replicas: 1 # Single replica for local development
 
     jetstream:
       fileStore:
@@ -121,7 +121,7 @@ natsExternalService:
 
 # Use simple passwords for local development
 natsAccountsSecret:
-  enabled: true 
+  enabled: true
   data:
     - name: NATS_SYS_USER
       value: sys
@@ -132,6 +132,6 @@ natsAccountsSecret:
     - name: NATS_ADMIN_PASS
       value: admin
     - name: NATS_PUBLISHER_USER
-      value: default_user 
+      value: default_user
     - name: NATS_PUBLISHER_PASS
-      value: ""
+      value: ""
diff --git a/cluster/charts/fuel-streams/values.yaml b/cluster/charts/fuel-streams/values.yaml
@@ -140,11 +140,6 @@ publisher:
         podValue: 4
         periodSeconds: 15
 
-  env:
-    PORT: 8080
-    PUBLISHER_MAX_THREADS: "32"
-    NATS_URL: "fuel-streams-nats-publisher:4222"
-
   # Additional environment variables with complex structures
   # extraEnv: []
   #   - name: RELAYER
@@ -169,6 +164,11 @@ publisher:
   #   - secretRef:
   #       name: additional-secrets
 
+  env:
+    PORT: 8080
+    PUBLISHER_MAX_THREADS: "32"
+    NATS_URL: "fuel-streams-nats-publisher:4222"
+
 # -------------------------------------------------------------------------------------------------
 # Consumer configuration
 # -------------------------------------------------------------------------------------------------
@@ -225,6 +225,29 @@ consumer:
         podValue: 4
         periodSeconds: 15
 
+# -------------------------------------------------------------------------------------------------
+# NATS Common Configuration
+# -------------------------------------------------------------------------------------------------
+
+natsExternalService:
+  enabled: true
+  certificate:
+    issuer: "letsencrypt-prod"
+    duration: "2160h"
+    renewBefore: "360h"
+    annotations: {}
+    labels: {}
+  service:
+    dns: "stream-dev.fuel.network"
+    labels: {}
+    annotations: {}
+
+# This is just need to run locally, for production you need to
+# create a secret with the correct values named fuel-streams-nats-accounts
+natsAccountsSecret:
+  enabled: false
+  data: []
+
 # -------------------------------------------------------------------------------------------------
 # NATS Core configuration
 # -------------------------------------------------------------------------------------------------
@@ -250,7 +273,7 @@ nats-core:
   container:
     image:
       repository: nats
-      tag: 2.10.22-alpine
+      tag: 2.10.24-alpine
     env:
       GOMEMLIMIT: 7GiB
     merge:
@@ -270,8 +293,6 @@ nats-core:
         enabled: true
       leafnodes:
         enabled: true
-      mqtt:
-        enabled: false
       monitor:
         enabled: false
 
@@ -282,7 +303,7 @@ nats-core:
       replicas: 5
       routeURLs:
         useFQDN: true
-    
+
     websocket:
       enabled: true
       port: 8443
@@ -308,11 +329,13 @@ nats-core:
       max_payload: << 32MiB >>
       jetstream:
         domain: CORE
+        sync_interval: << 30s >>
+        max_outstanding_catchup: << 512MiB >>
         max_file_store: << 2000GiB >>
         max_memory_store: << 7GiB >>
       system_account: SYS
       $include: auth.conf
-  
+
   configMap:
     merge:
       $tplYaml: |
@@ -339,7 +362,7 @@ nats-publisher:
   container:
     image:
       repository: nats
-      tag: 2.10.22-alpine
+      tag: 2.10.24-alpine
     env:
       GOMEMLIMIT: 7GiB
     merge:
@@ -353,28 +376,12 @@ nats-publisher:
     ports:
       nats:
         enabled: true
-      websocket:
-        enabled: false
       leafnodes:
         enabled: true
       monitor:
         enabled: false
-      mqtt:
-        enabled: false
-
-  podTemplate:
-    topologySpreadConstraints:
-      kubernetes.io/hostname:
-        maxSkew: 1
-        whenUnsatisfiable: DoNotSchedule
 
   config:
-    cluster:
-      enabled: false
-
-    websocket:
-      enabled: false
-
     jetstream:
       enabled: true
       fileStore:
@@ -389,9 +396,7 @@ nats-publisher:
       port: 7422
       merge:
         remotes:
-          - urls: ["nats://sys:sys@fuel-streams-nats-core:7422"]
-            account: SYS
-          - urls: ["nats://admin:admin@fuel-streams-nats-core:7422"]
+          - urls: ["nats-leaf://admin:admin@fuel-streams-nats-core:7422"]
             account: ADMIN
 
     monitor:
@@ -402,6 +407,8 @@ nats-publisher:
       max_payload: << 32MiB >>
       jetstream:
         domain: PUBLISHER
+        sync_interval: << 30s >>
+        max_outstanding_catchup: << 512MiB >>
         max_file_store: << 100GiB >>
         max_memory_store: << 7GiB >>
       system_account: SYS
@@ -422,9 +429,6 @@ nats-client:
   natsBox:
     enabled: false
 
-  promExporter:
-    enabled: false
-
   statefulSet:
     merge:
       spec:
@@ -433,7 +437,7 @@ nats-client:
   container:
     image:
       repository: nats
-      tag: 2.10.22-alpine
+      tag: 2.10.24-alpine
     env:
       GOMEMLIMIT: 7GiB
     merge:
@@ -454,18 +458,9 @@ nats-client:
       monitor:
         enabled: false
       mqtt:
-        enabled: false 
-
-  podTemplate:
-    topologySpreadConstraints:
-      kubernetes.io/hostname:
-        maxSkew: 1
-        whenUnsatisfiable: DoNotSchedule
+        enabled: false
 
   config:
-    cluster:
-      enabled: false
-
     jetstream:
       enabled: true
       fileStore:
@@ -480,7 +475,7 @@ nats-client:
       port: 7422
       merge:
         remotes:
-          - urls: ["ws://admin:admin@fuel-streams-nats-core:8443"]
+          - urls: ["nats-leaf://admin:admin@fuel-streams-nats-core:7422"]
             account: ADMIN
 
     websocket:
@@ -509,6 +504,8 @@ nats-client:
       max_payload: << 32MiB >>
       jetstream:
         domain: CLIENT
+        sync_interval: << 30s >>
+        max_outstanding_catchup: << 512MiB >>
         max_file_store: << 100GiB >>
         max_memory_store: << 7GiB >>
       system_account: SYS
@@ -519,29 +516,6 @@ nats-client:
       $tplYaml: |
         {{- include "nats-accounts" . | nindent 8 }}
 
-# -------------------------------------------------------------------------------------------------
-# NATS External Service configuration (WebSocket)
-# -------------------------------------------------------------------------------------------------
-
-natsExternalService:
-  enabled: true
-  certificate:
-    issuer: "letsencrypt-prod"
-    duration: "2160h"
-    renewBefore: "360h"
-    annotations: {}
-    labels: {}
-  service:
-    dns: "stream-dev.fuel.network"
-    labels: {}
-    annotations: {}
-
-# This is just need to run locally, for production you need to
-# create a secret with the correct values named fuel-streams-nats-accounts
-natsAccountsSecret:
-  enabled: false
-  data: []
-
 # -------------------------------------------------------------------------------------------------
 # WebServer configuration
 # -------------------------------------------------------------------------------------------------