MG-154 - Jaeger and Cassandra pods are not stable (#155)

* Enable persistnce in cassandra; add more resources Signed-off-by: JeffMboya <jangina.mboya@gmail.com> * remove resources sections Signed-off-by: JeffMboya <jangina.mboya@gmail.com> * add config Signed-off-by: JeffMboya <jangina.mboya@gmail.com> * Update README Signed-off-by: JeffMboya <jangina.mboya@gmail.com> * Update chart version Signed-off-by: JeffMboya <jangina.mboya@gmail.com> * Update bootstrap values Signed-off-by: JeffMboya <jangina.mboya@gmail.com> * Update app version Signed-off-by: JeffMboya <jangina.mboya@gmail.com> * Remove unnecessary config Signed-off-by: JeffMboya <jangina.mboya@gmail.com> --------- Signed-off-by: JeffMboya <jangina.mboya@gmail.com>
absmach · Oct 1, 2024 · 171605a · 171605a
1 parent 5733334
commit 171605a
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 41 deletions.
diff --git a/charts/magistrala/Chart.yaml b/charts/magistrala/Chart.yaml
@@ -6,7 +6,7 @@ name: magistrala
 description: Magistrala IoT Platform
 icon: https://avatars1.githubusercontent.com/u/13207490
 type: application
-version: 0.14.0 # Incremented chart version if the chart is updated
+version: 0.14.1 # Incremented chart version if the chart is updated
 appVersion: "0.14.0" # Update application version if the app is updated
 home: https://abstractmachines.fr/magistrala.html
 sources:

diff --git a/charts/magistrala/README.md b/charts/magistrala/README.md
@@ -2,7 +2,7 @@
 
 Magistrala IoT Platform
 
-![Version: 0.14.0](https://img.shields.io/badge/Version-0.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.14.0](https://img.shields.io/badge/AppVersion-0.14.0-informational?style=flat-square)
+![Version: 0.14.1](https://img.shields.io/badge/Version-0.14.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.14.0](https://img.shields.io/badge/AppVersion-0.14.0-informational?style=flat-square)
 
 **Homepage:** <https://abstractmachines.fr/magistrala.html>
 
@@ -60,14 +60,8 @@ Magistrala IoT Platform
 | bootstrap.encKey | string | `"randomstring"` |  |
 | bootstrap.eventConsumerName | string | `"EventConsumerByBootstrap"` |  |
 | bootstrap.httpPort | int | `9013` |  |
-| bootstrap.image.pullPolicy | string | `"IfNotPresent"` |  |
-| bootstrap.image.pullSecrets | object | `{}` |  |
-| bootstrap.image.repository | string | `"magistrala/bootstrap"` |  |
-| bootstrap.image.tag | string | `"latest"` |  |
-| bootstrap.jaegerTraceRatio | float | `1` |  |
-| bootstrap.logLevel | string | `"info"` |  |
+| bootstrap.image | object | `{}` |  |
 | bootstrap.redisESPort | int | `6379` |  |
-| bootstrap.sendTelemetry | bool | `true` |  |
 | certs.enabled | bool | `true` |  |
 | certs.httpPort | int | `9019` |  |
 | certs.image | object | `{}` |  |
@@ -101,13 +95,26 @@ Magistrala IoT Platform
 | invitations.image | object | `{}` |  |
 | jaeger.agent.enabled | bool | `false` |  |
 | jaeger.allInOne.enabled | bool | `false` |  |
-| jaeger.collector.service.otlp.grpc.name | string | `"otlp-grpc"` |  |
-| jaeger.collector.service.otlp.grpc.port | int | `4317` |  |
-| jaeger.collector.service.otlp.http.name | string | `"otlp-http"` |  |
-| jaeger.collector.service.otlp.http.port | int | `4318` |  |
+| jaeger.cassandra.config.cluster_name | string | `"jaeger"` |  |
+| jaeger.cassandra.config.dc_name | string | `"dc1"` |  |
+| jaeger.cassandra.config.endpoint_snitch | string | `"GossipingPropertyFileSnitch"` |  |
+| jaeger.cassandra.config.rack_name | string | `"rack1"` |  |
+| jaeger.cassandra.config.seed_size | int | `1` |  |
+| jaeger.cassandra.persistence.accessModes[0] | string | `"ReadWriteOnce"` |  |
+| jaeger.cassandra.persistence.enabled | bool | `true` |  |
+| jaeger.cassandra.persistence.size | string | `"10Gi"` |  |
+| jaeger.cassandra.persistence.storageClass | string | `"do-block-storage"` |  |
 | jaeger.fullnameOverride | string | `"magistrala-jaeger"` |  |
 | jaeger.provisionDataStore.cassandra | bool | `true` |  |
-| jaeger.storage.type | string | `"memory"` |  |
+| jaeger.storage.cassandra.host | string | `"magistrala-cassandra.mg.svc.cluster.local"` |  |
+| jaeger.storage.cassandra.keyspace | string | `"jaeger_v1"` |  |
+| jaeger.storage.cassandra.password | string | `"cassandra_password"` |  |
+| jaeger.storage.cassandra.port | int | `9042` |  |
+| jaeger.storage.cassandra.schemaJobEnabled | bool | `true` |  |
+| jaeger.storage.cassandra.tls.enabled | bool | `false` |  |
+| jaeger.storage.cassandra.usePassword | bool | `true` |  |
+| jaeger.storage.cassandra.user | string | `"cassandra_user"` |  |
+| jaeger.storage.type | string | `"cassandra"` |  |
 | journal.enabled | bool | `true` |  |
 | journal.httpPort | int | `9021` |  |
 | journal.image | object | `{}` |  |
@@ -314,4 +321,4 @@ Magistrala IoT Platform
 | users.passwordRegex | string | `"^.{8,}$"` |  |
 | users.secretKey | string | `"secretKey"` |  |
 | users.tokenResetEndpoint | string | `"/reset-request"` |  |
-| vault.enabled | bool | `true` |  |
+| vault.enabled | bool | `false` |  |
diff --git a/charts/magistrala/values.yaml b/charts/magistrala/values.yaml
@@ -58,7 +58,14 @@ jaeger:
   allInOne:
     enabled: false
   storage:
-    type: memory
+    type: cassandra
+  cassandra:
+    persistence:
+      enabled: true
+      storageClass: "do-block-storage"
+      accessModes:
+        - ReadWriteOnce
+      size: 10Gi
   collector:
     service:
       otlp:
@@ -68,6 +75,7 @@ jaeger:
         http:
           name: otlp-http
           port: 4318
+
 nats:
   config:
     cluster:
@@ -84,7 +92,8 @@ nats:
         maxSize: 2Gi
 
 adapter_coap:
-  image: {}
+  image:
+    {}
     # pullSecrets: {}
     # If your image repository requires authentication, you can specify image pull secrets here.
     # Example:
@@ -138,7 +147,8 @@ adapter_coap:
   #     effect: "NoSchedule"
 
 adapter_http:
-  image: {}
+  image:
+    {}
     # pullSecrets: {}
     # repository: "magistrala/adapter-http"
     # tag: "latest"
@@ -228,7 +238,8 @@ postgresqlspicedb:
 
 auth:
   # logLevel: error
-  image: {}
+  image:
+    {}
     # pullSecrets: {}
     # rootRepository: "magistrala/auth"
     # tag: "latest"
@@ -269,11 +280,12 @@ postgresqlauth:
           postgresql: *postgresqlAuthPort
 
 users:
-  image: {}
-     # pullSecrets: {}
-     # repository: "magistrala/users"
-     # tag: "latest"
-     # pullPolicy: "IfNotPresent"
+  image:
+    {}
+    # pullSecrets: {}
+    # repository: "magistrala/users"
+    # tag: "latest"
+    # pullPolicy: "IfNotPresent"
   # jaegerTraceRatio: 1.0
   # sendTelemetry: true
   # logLevel: "info"
@@ -312,7 +324,8 @@ postgresqlusers:
           postgresql: *postgresqlUsersPort
 
 things:
-  image: {}
+  image:
+    {}
     # pullSecrets: {}
     # repository: "magistrala/things"
     # tag: "latest"
@@ -356,14 +369,14 @@ redis-things:
 
 bootstrap:
   enabled: true
-  image:
-    pullSecrets: {}
-    repository: "magistrala/bootstrap"
-    tag: "latest"
-    pullPolicy: "IfNotPresent"
-  jaegerTraceRatio: 1.0
-  sendTelemetry: true
-  logLevel: "info"
+  image: {}
+  #   pullSecrets: {}
+  #   repository: "magistrala/bootstrap"
+  #   tag: "latest"
+  #   pullPolicy: "IfNotPresent"
+  # jaegerTraceRatio: 1.0
+  # sendTelemetry: true
+  # logLevel: "info"
   httpPort: 9013
   redisESPort: 6379
   encKey: "randomstring"
@@ -394,7 +407,8 @@ postgresqlbootstrap:
 
 certs:
   enabled: true
-  image: {}
+  image:
+    {}
     # pullSecrets: {}
     # repository: "magistrala/certs"
     # tag: "latest"
@@ -438,7 +452,8 @@ postgresqlcerts:
 
 invitations:
   enabled: true
-  image: {}
+  image:
+    {}
     # pullSecrets: {}
     # repository: "magistrala/invitations"
     # tag: "latest"
@@ -473,7 +488,8 @@ postgresqlinvitations:
 
 journal:
   enabled: true
-  image: {}
+  image:
+    {}
     # pullSecrets: {}
     # repository: "magistrala/journal"
     # tag: "latest"
@@ -516,7 +532,8 @@ timescaledb:
   username: &messagesRwTimescaleUsername magistrala
   password: &messagesRwTimescalePassword magistrala
   reader:
-    image: {}
+    image:
+      {}
       # pullSecrets: {}
       # repository: "magistrala/timescale-reader"
       # tag: "latest"
@@ -525,12 +542,13 @@ timescaledb:
     # sendTelemetry: true
     # logLevel: "info"
     enabled: true
-    http: {port: 9011}
+    http: { port: 9011 }
     # nodeSelector: {}
     # affinity: {}
     # tolerations: {}
   writer:
-    image: {}
+    image:
+      {}
       # pullSecrets: {}
       # repository: "magistrala/timescale-writer"
       # tag: "latest"
@@ -542,7 +560,7 @@ timescaledb:
     # affinity: {}
     # tolerations: {}
     enabled: true
-    http: {port: 9012}
+    http: { port: 9012 }
   ## Configurations of Bitnami postgres
   global:
     postgresql:
@@ -561,7 +579,8 @@ timescaledb:
 
 ui:
   enabled: true
-  image: {}
+  image:
+    {}
     # pullSecrets: {}
     # repository: "magistrala/ui"
     # tag: "latest"