Skip to content

Commit 171605a

Browse files
JeffMboyaJeffMboya
authored
MG-154 - Jaeger and Cassandra pods are not stable (#155)
* Enable persistnce in cassandra; add more resources Signed-off-by: JeffMboya <[email protected]> * remove resources sections Signed-off-by: JeffMboya <[email protected]> * add config Signed-off-by: JeffMboya <[email protected]> * Update README Signed-off-by: JeffMboya <[email protected]> * Update chart version Signed-off-by: JeffMboya <[email protected]> * Update bootstrap values Signed-off-by: JeffMboya <[email protected]> * Update app version Signed-off-by: JeffMboya <[email protected]> * Remove unnecessary config Signed-off-by: JeffMboya <[email protected]> --------- Signed-off-by: JeffMboya <[email protected]>
1 parent 5733334 commit 171605a

File tree

3 files changed

+67
-41
lines changed

3 files changed

+67
-41
lines changed

‎charts/magistrala/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: magistrala
66
description: Magistrala IoT Platform
77
icon: https://avatars1.githubusercontent.com/u/13207490
88
type: application
9-
version: 0.14.0 # Incremented chart version if the chart is updated
9+
version: 0.14.1 # Incremented chart version if the chart is updated
1010
appVersion: "0.14.0" # Update application version if the app is updated
1111
home: https://abstractmachines.fr/magistrala.html
1212
sources:

‎charts/magistrala/README.md

+21-14
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Magistrala IoT Platform
44

5-
![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)
5+
![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)
66

77
**Homepage:** <https://abstractmachines.fr/magistrala.html>
88

@@ -60,14 +60,8 @@ Magistrala IoT Platform
6060
| bootstrap.encKey | string | `"randomstring"` | |
6161
| bootstrap.eventConsumerName | string | `"EventConsumerByBootstrap"` | |
6262
| bootstrap.httpPort | int | `9013` | |
63-
| bootstrap.image.pullPolicy | string | `"IfNotPresent"` | |
64-
| bootstrap.image.pullSecrets | object | `{}` | |
65-
| bootstrap.image.repository | string | `"magistrala/bootstrap"` | |
66-
| bootstrap.image.tag | string | `"latest"` | |
67-
| bootstrap.jaegerTraceRatio | float | `1` | |
68-
| bootstrap.logLevel | string | `"info"` | |
63+
| bootstrap.image | object | `{}` | |
6964
| bootstrap.redisESPort | int | `6379` | |
70-
| bootstrap.sendTelemetry | bool | `true` | |
7165
| certs.enabled | bool | `true` | |
7266
| certs.httpPort | int | `9019` | |
7367
| certs.image | object | `{}` | |
@@ -101,13 +95,26 @@ Magistrala IoT Platform
10195
| invitations.image | object | `{}` | |
10296
| jaeger.agent.enabled | bool | `false` | |
10397
| jaeger.allInOne.enabled | bool | `false` | |
104-
| jaeger.collector.service.otlp.grpc.name | string | `"otlp-grpc"` | |
105-
| jaeger.collector.service.otlp.grpc.port | int | `4317` | |
106-
| jaeger.collector.service.otlp.http.name | string | `"otlp-http"` | |
107-
| jaeger.collector.service.otlp.http.port | int | `4318` | |
98+
| jaeger.cassandra.config.cluster_name | string | `"jaeger"` | |
99+
| jaeger.cassandra.config.dc_name | string | `"dc1"` | |
100+
| jaeger.cassandra.config.endpoint_snitch | string | `"GossipingPropertyFileSnitch"` | |
101+
| jaeger.cassandra.config.rack_name | string | `"rack1"` | |
102+
| jaeger.cassandra.config.seed_size | int | `1` | |
103+
| jaeger.cassandra.persistence.accessModes[0] | string | `"ReadWriteOnce"` | |
104+
| jaeger.cassandra.persistence.enabled | bool | `true` | |
105+
| jaeger.cassandra.persistence.size | string | `"10Gi"` | |
106+
| jaeger.cassandra.persistence.storageClass | string | `"do-block-storage"` | |
108107
| jaeger.fullnameOverride | string | `"magistrala-jaeger"` | |
109108
| jaeger.provisionDataStore.cassandra | bool | `true` | |
110-
| jaeger.storage.type | string | `"memory"` | |
109+
| jaeger.storage.cassandra.host | string | `"magistrala-cassandra.mg.svc.cluster.local"` | |
110+
| jaeger.storage.cassandra.keyspace | string | `"jaeger_v1"` | |
111+
| jaeger.storage.cassandra.password | string | `"cassandra_password"` | |
112+
| jaeger.storage.cassandra.port | int | `9042` | |
113+
| jaeger.storage.cassandra.schemaJobEnabled | bool | `true` | |
114+
| jaeger.storage.cassandra.tls.enabled | bool | `false` | |
115+
| jaeger.storage.cassandra.usePassword | bool | `true` | |
116+
| jaeger.storage.cassandra.user | string | `"cassandra_user"` | |
117+
| jaeger.storage.type | string | `"cassandra"` | |
111118
| journal.enabled | bool | `true` | |
112119
| journal.httpPort | int | `9021` | |
113120
| journal.image | object | `{}` | |
@@ -314,4 +321,4 @@ Magistrala IoT Platform
314321
| users.passwordRegex | string | `"^.{8,}$"` | |
315322
| users.secretKey | string | `"secretKey"` | |
316323
| users.tokenResetEndpoint | string | `"/reset-request"` | |
317-
| vault.enabled | bool | `true` | |
324+
| vault.enabled | bool | `false` | |

‎charts/magistrala/values.yaml

+45-26
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,14 @@ jaeger:
5858
allInOne:
5959
enabled: false
6060
storage:
61-
type: memory
61+
type: cassandra
62+
cassandra:
63+
persistence:
64+
enabled: true
65+
storageClass: "do-block-storage"
66+
accessModes:
67+
- ReadWriteOnce
68+
size: 10Gi
6269
collector:
6370
service:
6471
otlp:
@@ -68,6 +75,7 @@ jaeger:
6875
http:
6976
name: otlp-http
7077
port: 4318
78+
7179
nats:
7280
config:
7381
cluster:
@@ -84,7 +92,8 @@ nats:
8492
maxSize: 2Gi
8593

8694
adapter_coap:
87-
image: {}
95+
image:
96+
{}
8897
# pullSecrets: {}
8998
# If your image repository requires authentication, you can specify image pull secrets here.
9099
# Example:
@@ -138,7 +147,8 @@ adapter_coap:
138147
# effect: "NoSchedule"
139148

140149
adapter_http:
141-
image: {}
150+
image:
151+
{}
142152
# pullSecrets: {}
143153
# repository: "magistrala/adapter-http"
144154
# tag: "latest"
@@ -228,7 +238,8 @@ postgresqlspicedb:
228238

229239
auth:
230240
# logLevel: error
231-
image: {}
241+
image:
242+
{}
232243
# pullSecrets: {}
233244
# rootRepository: "magistrala/auth"
234245
# tag: "latest"
@@ -269,11 +280,12 @@ postgresqlauth:
269280
postgresql: *postgresqlAuthPort
270281

271282
users:
272-
image: {}
273-
# pullSecrets: {}
274-
# repository: "magistrala/users"
275-
# tag: "latest"
276-
# pullPolicy: "IfNotPresent"
283+
image:
284+
{}
285+
# pullSecrets: {}
286+
# repository: "magistrala/users"
287+
# tag: "latest"
288+
# pullPolicy: "IfNotPresent"
277289
# jaegerTraceRatio: 1.0
278290
# sendTelemetry: true
279291
# logLevel: "info"
@@ -312,7 +324,8 @@ postgresqlusers:
312324
postgresql: *postgresqlUsersPort
313325

314326
things:
315-
image: {}
327+
image:
328+
{}
316329
# pullSecrets: {}
317330
# repository: "magistrala/things"
318331
# tag: "latest"
@@ -356,14 +369,14 @@ redis-things:
356369

357370
bootstrap:
358371
enabled: true
359-
image:
360-
pullSecrets: {}
361-
repository: "magistrala/bootstrap"
362-
tag: "latest"
363-
pullPolicy: "IfNotPresent"
364-
jaegerTraceRatio: 1.0
365-
sendTelemetry: true
366-
logLevel: "info"
372+
image: {}
373+
# pullSecrets: {}
374+
# repository: "magistrala/bootstrap"
375+
# tag: "latest"
376+
# pullPolicy: "IfNotPresent"
377+
# jaegerTraceRatio: 1.0
378+
# sendTelemetry: true
379+
# logLevel: "info"
367380
httpPort: 9013
368381
redisESPort: 6379
369382
encKey: "randomstring"
@@ -394,7 +407,8 @@ postgresqlbootstrap:
394407

395408
certs:
396409
enabled: true
397-
image: {}
410+
image:
411+
{}
398412
# pullSecrets: {}
399413
# repository: "magistrala/certs"
400414
# tag: "latest"
@@ -438,7 +452,8 @@ postgresqlcerts:
438452

439453
invitations:
440454
enabled: true
441-
image: {}
455+
image:
456+
{}
442457
# pullSecrets: {}
443458
# repository: "magistrala/invitations"
444459
# tag: "latest"
@@ -473,7 +488,8 @@ postgresqlinvitations:
473488

474489
journal:
475490
enabled: true
476-
image: {}
491+
image:
492+
{}
477493
# pullSecrets: {}
478494
# repository: "magistrala/journal"
479495
# tag: "latest"
@@ -516,7 +532,8 @@ timescaledb:
516532
username: &messagesRwTimescaleUsername magistrala
517533
password: &messagesRwTimescalePassword magistrala
518534
reader:
519-
image: {}
535+
image:
536+
{}
520537
# pullSecrets: {}
521538
# repository: "magistrala/timescale-reader"
522539
# tag: "latest"
@@ -525,12 +542,13 @@ timescaledb:
525542
# sendTelemetry: true
526543
# logLevel: "info"
527544
enabled: true
528-
http: {port: 9011}
545+
http: { port: 9011 }
529546
# nodeSelector: {}
530547
# affinity: {}
531548
# tolerations: {}
532549
writer:
533-
image: {}
550+
image:
551+
{}
534552
# pullSecrets: {}
535553
# repository: "magistrala/timescale-writer"
536554
# tag: "latest"
@@ -542,7 +560,7 @@ timescaledb:
542560
# affinity: {}
543561
# tolerations: {}
544562
enabled: true
545-
http: {port: 9012}
563+
http: { port: 9012 }
546564
## Configurations of Bitnami postgres
547565
global:
548566
postgresql:
@@ -561,7 +579,8 @@ timescaledb:
561579

562580
ui:
563581
enabled: true
564-
image: {}
582+
image:
583+
{}
565584
# pullSecrets: {}
566585
# repository: "magistrala/ui"
567586
# tag: "latest"

0 commit comments

Comments
 (0)