From 03e4dc8dcccedc42a70deb5c3344a723b508923a Mon Sep 17 00:00:00 2001 From: JeffMboya Date: Thu, 26 Sep 2024 15:32:23 +0300 Subject: [PATCH 1/8] Enable persistnce in cassandra; add more resources Signed-off-by: JeffMboya --- charts/magistrala/values.yaml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/charts/magistrala/values.yaml b/charts/magistrala/values.yaml index dfe77cf..edea139 100644 --- a/charts/magistrala/values.yaml +++ b/charts/magistrala/values.yaml @@ -58,7 +58,22 @@ jaeger: allInOne: enabled: false storage: - type: memory + type: cassandra + cassandra: + persistence: + enabled: true + storageClass: "do-block-storage" + size: 10Gi + resources: + requests: + memory: "4Gi" + cpu: "1000m" + limits: + memory: "6Gi" + cpu: "2000m" + env: + MAX_HEAP_SIZE: "4096M" + HEAP_NEWSIZE: "1024M" collector: service: otlp: From 55c6c97d9bb6e578bae9c2a51d2456db5dc72ea1 Mon Sep 17 00:00:00 2001 From: JeffMboya Date: Thu, 26 Sep 2024 17:10:49 +0300 Subject: [PATCH 2/8] remove resources sections Signed-off-by: JeffMboya --- charts/magistrala/values.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/charts/magistrala/values.yaml b/charts/magistrala/values.yaml index edea139..a1d9920 100644 --- a/charts/magistrala/values.yaml +++ b/charts/magistrala/values.yaml @@ -64,16 +64,6 @@ jaeger: enabled: true storageClass: "do-block-storage" size: 10Gi - resources: - requests: - memory: "4Gi" - cpu: "1000m" - limits: - memory: "6Gi" - cpu: "2000m" - env: - MAX_HEAP_SIZE: "4096M" - HEAP_NEWSIZE: "1024M" collector: service: otlp: From 2a70782902607712fde806083429d5f4b6bacc49 Mon Sep 17 00:00:00 2001 From: JeffMboya Date: Fri, 27 Sep 2024 13:24:29 +0300 Subject: [PATCH 3/8] add config Signed-off-by: JeffMboya --- charts/magistrala/values.yaml | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/charts/magistrala/values.yaml b/charts/magistrala/values.yaml index a1d9920..8347e92 100644 --- a/charts/magistrala/values.yaml +++ b/charts/magistrala/values.yaml @@ -59,20 +59,29 @@ jaeger: enabled: false storage: type: cassandra + cassandra: + host: magistrala-cassandra.mg.svc.cluster.local + port: 9042 + schemaJobEnabled: true + tls: + enabled: false + user: cassandra_user + usePassword: true + password: cassandra_password + keyspace: jaeger_v1 cassandra: persistence: enabled: true storageClass: "do-block-storage" + accessModes: + - ReadWriteOnce size: 10Gi - collector: - service: - otlp: - grpc: - name: otlp-grpc - port: 4317 - http: - name: otlp-http - port: 4318 + config: + cluster_name: jaeger + seed_size: 1 + dc_name: dc1 + rack_name: rack1 + endpoint_snitch: GossipingPropertyFileSnitch nats: config: cluster: From 5ef2d1fdff33fc139c99bd42d3589c4118b60b84 Mon Sep 17 00:00:00 2001 From: JeffMboya Date: Sat, 28 Sep 2024 13:47:25 +0300 Subject: [PATCH 4/8] Update README Signed-off-by: JeffMboya --- charts/magistrala/README.md | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/charts/magistrala/README.md b/charts/magistrala/README.md index d8da7c0..f627433 100644 --- a/charts/magistrala/README.md +++ b/charts/magistrala/README.md @@ -101,13 +101,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 | `{}` | | From de5bba61095b3751ded0c6861e865e7d9fa0753c Mon Sep 17 00:00:00 2001 From: JeffMboya Date: Sun, 29 Sep 2024 08:56:45 +0300 Subject: [PATCH 5/8] Update chart version Signed-off-by: JeffMboya --- charts/magistrala/Chart.yaml | 4 ++-- charts/magistrala/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/magistrala/Chart.yaml b/charts/magistrala/Chart.yaml index a01e7d3..db2dad5 100644 --- a/charts/magistrala/Chart.yaml +++ b/charts/magistrala/Chart.yaml @@ -6,8 +6,8 @@ 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 -appVersion: "0.14.0" # Update application version if the app is updated +version: 0.14.1 # Incremented chart version if the chart is updated +appVersion: "0.14.1" # Update application version if the app is updated home: https://abstractmachines.fr/magistrala.html sources: - https://hub.docker.com/u/magistrala diff --git a/charts/magistrala/README.md b/charts/magistrala/README.md index f627433..a1789f0 100644 --- 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.1](https://img.shields.io/badge/AppVersion-0.14.1-informational?style=flat-square) **Homepage:** From 6bc92221dcf55ab1297ea5bd35690a50bd488ca6 Mon Sep 17 00:00:00 2001 From: JeffMboya Date: Sun, 29 Sep 2024 16:43:54 +0300 Subject: [PATCH 6/8] Update bootstrap values Signed-off-by: JeffMboya --- charts/magistrala/README.md | 10 ++---- charts/magistrala/values.yaml | 61 +++++++++++++++++++++-------------- 2 files changed, 38 insertions(+), 33 deletions(-) diff --git a/charts/magistrala/README.md b/charts/magistrala/README.md index a1789f0..f68a1b4 100644 --- a/charts/magistrala/README.md +++ b/charts/magistrala/README.md @@ -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 | `{}` | | @@ -327,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 index 8347e92..c9b0dd1 100644 --- a/charts/magistrala/values.yaml +++ b/charts/magistrala/values.yaml @@ -98,7 +98,8 @@ nats: maxSize: 2Gi adapter_coap: - image: {} + image: + {} # pullSecrets: {} # If your image repository requires authentication, you can specify image pull secrets here. # Example: @@ -152,7 +153,8 @@ adapter_coap: # effect: "NoSchedule" adapter_http: - image: {} + image: + {} # pullSecrets: {} # repository: "magistrala/adapter-http" # tag: "latest" @@ -242,7 +244,8 @@ postgresqlspicedb: auth: # logLevel: error - image: {} + image: + {} # pullSecrets: {} # rootRepository: "magistrala/auth" # tag: "latest" @@ -283,11 +286,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" @@ -326,7 +330,8 @@ postgresqlusers: postgresql: *postgresqlUsersPort things: - image: {} + image: + {} # pullSecrets: {} # repository: "magistrala/things" # tag: "latest" @@ -370,14 +375,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" @@ -408,7 +413,8 @@ postgresqlbootstrap: certs: enabled: true - image: {} + image: + {} # pullSecrets: {} # repository: "magistrala/certs" # tag: "latest" @@ -452,7 +458,8 @@ postgresqlcerts: invitations: enabled: true - image: {} + image: + {} # pullSecrets: {} # repository: "magistrala/invitations" # tag: "latest" @@ -487,7 +494,8 @@ postgresqlinvitations: journal: enabled: true - image: {} + image: + {} # pullSecrets: {} # repository: "magistrala/journal" # tag: "latest" @@ -530,7 +538,8 @@ timescaledb: username: &messagesRwTimescaleUsername magistrala password: &messagesRwTimescalePassword magistrala reader: - image: {} + image: + {} # pullSecrets: {} # repository: "magistrala/timescale-reader" # tag: "latest" @@ -539,12 +548,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" @@ -556,7 +566,7 @@ timescaledb: # affinity: {} # tolerations: {} enabled: true - http: {port: 9012} + http: { port: 9012 } ## Configurations of Bitnami postgres global: postgresql: @@ -575,7 +585,8 @@ timescaledb: ui: enabled: true - image: {} + image: + {} # pullSecrets: {} # repository: "magistrala/ui" # tag: "latest" From adde8ae1dab2eb1bd7f6e48d7e3fbf2b3371f2c2 Mon Sep 17 00:00:00 2001 From: JeffMboya Date: Sun, 29 Sep 2024 16:46:45 +0300 Subject: [PATCH 7/8] Update app version Signed-off-by: JeffMboya --- charts/magistrala/Chart.yaml | 2 +- charts/magistrala/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/magistrala/Chart.yaml b/charts/magistrala/Chart.yaml index db2dad5..a5fe74f 100644 --- a/charts/magistrala/Chart.yaml +++ b/charts/magistrala/Chart.yaml @@ -7,7 +7,7 @@ description: Magistrala IoT Platform icon: https://avatars1.githubusercontent.com/u/13207490 type: application version: 0.14.1 # Incremented chart version if the chart is updated -appVersion: "0.14.1" # Update application version if the app is updated +appVersion: "0.14.0" # Update application version if the app is updated home: https://abstractmachines.fr/magistrala.html sources: - https://hub.docker.com/u/magistrala diff --git a/charts/magistrala/README.md b/charts/magistrala/README.md index f68a1b4..eee3aeb 100644 --- a/charts/magistrala/README.md +++ b/charts/magistrala/README.md @@ -2,7 +2,7 @@ Magistrala IoT Platform -![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.1](https://img.shields.io/badge/AppVersion-0.14.1-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:** From 5f942d508eee722a6d8a466a2fcae9a252a08f29 Mon Sep 17 00:00:00 2001 From: JeffMboya Date: Mon, 30 Sep 2024 10:31:40 +0300 Subject: [PATCH 8/8] Remove unnecessary config Signed-off-by: JeffMboya --- charts/magistrala/values.yaml | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/charts/magistrala/values.yaml b/charts/magistrala/values.yaml index c9b0dd1..a0a25ae 100644 --- a/charts/magistrala/values.yaml +++ b/charts/magistrala/values.yaml @@ -59,16 +59,6 @@ jaeger: enabled: false storage: type: cassandra - cassandra: - host: magistrala-cassandra.mg.svc.cluster.local - port: 9042 - schemaJobEnabled: true - tls: - enabled: false - user: cassandra_user - usePassword: true - password: cassandra_password - keyspace: jaeger_v1 cassandra: persistence: enabled: true @@ -76,12 +66,16 @@ jaeger: accessModes: - ReadWriteOnce size: 10Gi - config: - cluster_name: jaeger - seed_size: 1 - dc_name: dc1 - rack_name: rack1 - endpoint_snitch: GossipingPropertyFileSnitch + collector: + service: + otlp: + grpc: + name: otlp-grpc + port: 4317 + http: + name: otlp-http + port: 4318 + nats: config: cluster: