update charts jaeger,redis,cassandra,ingress path

Signed-off-by: Arvindh <[email protected]>
absmach · Feb 24, 2025 · aec97fd · aec97fd
1 parent 46692b9
commit aec97fd
Show file tree

Hide file tree

Showing 18 changed files with 403 additions and 204 deletions.
diff --git a/charts/supermq/Chart.lock b/charts/supermq/Chart.lock
@@ -1,10 +1,16 @@
 dependencies:
+- name: common
+  repository: https://charts.bitnami.com/bitnami
+  version: 2.27.0
 - name: nats
   repository: https://nats-io.github.io/k8s/helm/charts/
   version: 1.2.1
 - name: jaeger
   repository: https://jaegertracing.github.io/helm-charts
   version: 3.1.1
+- name: cassandra
+  repository: https://charts.bitnami.com/bitnami
+  version: 12.1.3
 - name: postgresql
   repository: https://charts.bitnami.com/bitnami
   version: 12.5.6
@@ -50,8 +56,5 @@ dependencies:
 - name: fluent-bit
   repository: https://fluent.github.io/helm-charts
   version: 0.48.5
-- name: cassandra
-  repository: https://charts.bitnami.com/bitnami
-  version: 12.1.3
-digest: sha256:9bcc318fd2fd0a67b333d841606149e306aa288c8f25174539cfa1c97d86621e
-generated: "2025-02-20T22:29:51.474878419+03:00"
+digest: sha256:d9210afb7e480601d8b77aa9c30df43cb51f2836441ec6d2ce3567fe1d571695
+generated: "2025-02-21T23:37:54.778328846+05:30"
diff --git a/charts/supermq/Chart.yaml b/charts/supermq/Chart.yaml
@@ -18,13 +18,25 @@ maintainers:
     email: [email protected]
 
 dependencies:
+  - name: common
+    version: 2.x.x
+    repository: "@bitnami"
+
   - name: nats
     version: "1.2.1"
     repository: "@nats"
 
   - name: jaeger
     version: "3.1.1"
     repository: "@jaegertracing"
+    condition: jaeger.enabled
+
+  - name: cassandra
+    version: "12.1.3"
+    repository: "https://charts.bitnami.com/bitnami"
+    alias: cassandra
+    condition: jaeger.enabled
+
 
   - name: postgresql
     version: "12.5.6"
@@ -89,7 +101,14 @@ dependencies:
   - name: redis
     version: "19.6.2"
     repository: "@bitnami"
-    alias: redis-clients
+    alias: redisclients
+    condition: redisclients.enabled
+
+  - name: redis
+    version: "19.6.2"
+    repository: "@bitnami"
+    alias: redisdomains
+    condition: redisdomains.enabled
 
   - name: vault
     version: "0.28.1"
@@ -115,8 +134,3 @@ dependencies:
     alias: fluent-bit
     condition: fluent-bit.enabled
 
-  - name: cassandra
-    version: "12.1.3"
-    repository: "https://charts.bitnami.com/bitnami"
-    alias: cassandra
-    condition: cassandra.enabled
diff --git a/charts/supermq/templates/_helpers.tpl b/charts/supermq/templates/_helpers.tpl
@@ -6,6 +6,19 @@ SPDX-License-Identifier: Apache-2.0
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+
+{{- define "cassandra.host" -}}
+{{- if .Values.provisionDataStore.cassandra -}}
+{{- if .Values.storage.cassandra.nameOverride }}
+{{- printf "%s" .Values.storage.cassandra.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name "cassandra" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- else }}
+{{- tpl .Values.storage.cassandra.host . }}
+{{- end -}}
+{{- end -}}
+
 {{- define "supermq.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}

diff --git a/charts/supermq/templates/adapter_coap-deployment.yaml b/charts/supermq/templates/adapter_coap-deployment.yaml
@@ -33,13 +33,13 @@ spec:
           imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.adapter_coap.image.pullPolicy }}
           env:
             - name: SMQ_JAEGER_URL
-              value: "http://{{ .Release.Name }}-jaeger-collector:{{ .Values.defaults.jaegerCollectorPort }}/v1/traces"
+              value: {{ .Values.jaeger.enabled | ternary (printf "http://%s-jaeger-collector:%d/v1/traces" .Release.Name (.Values.jaeger.collector.service.otlp.http.port | int )) .Values.jaeger.externalUrl }}
             - name: SMQ_JAEGER_TRACE_RATIO
-              value: {{ default .Values.defaults.jaegerTraceRatio .Values.adapter_coap.jaegerTraceRatio | quote  }}
+              value: {{ default .Values.jaeger.traceRatio .Values.adapter_coap.jaegerTraceRatio | quote  }}
             - name: SMQ_SEND_TELEMETRY
               value: {{ default .Values.defaults.sendTelemetry .Values.adapter_coap.sendTelemetry | quote  }}
             - name: SMQ_MESSAGE_BROKER_URL
-              value: nats://{{ .Release.Name }}-nats:{{ .Values.defaults.natsPort }}
+              value: {{ .Values.nats.enabled | ternary (printf "nats://%s-nats:%d" .Release.Name (.Values.nats.config.nats.port | int )) .Values.nats.externalAddress }}
             - name: SMQ_CLIENTS_AUTH_GRPC_URL
               value: {{ .Release.Name }}-envoy:{{ .Values.clients.authGrpcPort }}
             - name: SMQ_CLIENTS_AUTH_GRPC_TIMEOUT
@@ -59,7 +59,8 @@ spec:
             - name: SMQ_COAP_ADAPTER_PORT
               value: {{ .Values.adapter_coap.port | quote }}
             - name: SMQ_ES_URL
-              value: "{{ .Release.Name }}-nats:{{ .Values.defaults.natsPort }}"
+              value: {{ .Values.nats.enabled | ternary (printf "%s-nats:%d" .Release.Name (.Values.nats.config.nats.port | int )) .Values.nats.externalAddress }}
+
           ports:
             - containerPort: {{ .Values.adapter_coap.port }}
               protocol: UDP

diff --git a/charts/supermq/templates/adapter_http-deployment.yaml b/charts/supermq/templates/adapter_http-deployment.yaml
@@ -33,11 +33,11 @@ spec:
           imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.adapter_http.image.pullPolicy }}
           env:
             - name: SMQ_JAEGER_URL
-              value: "http://{{ .Release.Name }}-jaeger-collector:{{ .Values.defaults.jaegerCollectorPort }}/v1/traces"
+              value: {{ .Values.jaeger.enabled | ternary (printf "http://%s-jaeger-collector:%d/v1/traces" .Release.Name (.Values.jaeger.collector.service.otlp.http.port | int )) .Values.jaeger.externalUrl }}
             - name: SMQ_JAEGER_TRACE_RATIO
-              value: {{ default .Values.defaults.jaegerTraceRatio .Values.users.jaegerTraceRatio | quote  }}
+              value: {{ default .Values.jaeger.traceRatio .Values.adapter_http.jaegerTraceRatio | float64 | quote  }}
             - name: SMQ_SEND_TELEMETRY
-              value: {{ default .Values.defaults.sendTelemetry .Values.users.sendTelemetry | quote  }}
+              value: {{ default .Values.defaults.sendTelemetry .Values.adapter_http.sendTelemetry | quote  }}
             - name: SMQ_HTTP_ADAPTER_LOG_LEVEL
               value: {{ default .Values.defaults.logLevel .Values.adapter_http.logLevel | quote }}
             - name: SMQ_HTTP_ADAPTER_HOST
@@ -57,9 +57,9 @@ spec:
             - name: SMQ_AUTH_GRPC_TIMEOUT
               value: {{ .Values.auth.grpcTimeout | quote }}
             - name: SMQ_MESSAGE_BROKER_URL
-              value: nats://{{ .Release.Name }}-nats:{{ .Values.defaults.natsPort }}
+              value: {{ .Values.nats.enabled | ternary (printf "nats://%s-nats:%d" .Release.Name (.Values.nats.config.nats.port | int )) .Values.nats.externalAddress }}
             - name: SMQ_ES_URL
-              value: "{{ .Release.Name }}-nats:{{ .Values.defaults.natsPort }}"
+              value: {{ .Values.nats.enabled | ternary (printf "%s-nats:%d" .Release.Name (.Values.nats.config.nats.port | int )) .Values.nats.externalAddress }}
           ports:
             - containerPort: {{ .Values.adapter_http.httpPort }}
               protocol: TCP

diff --git a/charts/supermq/templates/adapter_mqtt-statefulstet.yaml b/charts/supermq/templates/adapter_mqtt-statefulstet.yaml
@@ -195,11 +195,11 @@ spec:
             - name: SMQ_CHANNELS_GRPC_TIMEOUT
               value: {{ .Values.channels.grpcTimeout | quote }}
             - name: SMQ_MESSAGE_BROKER_URL
-              value: nats://{{ .Release.Name }}-nats:{{ .Values.defaults.natsPort }}
+              value: {{ .Values.nats.enabled | ternary (printf "nats://%s-nats:%d" .Release.Name (.Values.nats.config.nats.port | int )) .Values.nats.externalAddress }}
             - name: SMQ_JAEGER_URL
-              value: "http://{{ .Release.Name }}-jaeger-collector:{{ .Values.defaults.jaegerCollectorPort }}/v1/traces"
+              value: {{ .Values.jaeger.enabled | ternary (printf "http://%s-jaeger-collector:%d/v1/traces" .Release.Name (.Values.jaeger.collector.service.otlp.http.port | int )) .Values.jaeger.externalUrl }}
             - name: SMQ_JAEGER_TRACE_RATIO
-              value: {{ default .Values.defaults.jaegerTraceRatio .Values.adapter_coap.jaegerTraceRatio | quote  }}
+              value: {{ default .Values.jaeger.traceRatio .Values.mqtt.adapter.jaegerTraceRatio | quote  }}
             - name: SMQ_MQTT_ADAPTER_MQTT_TARGET_HOST
               value: localhost
             - name: SMQ_SEND_TELEMETRY
@@ -211,7 +211,7 @@ spec:
             - name: SMQ_MQTT_ADAPTER_WS_TARGET_PORT
               value: {{ .Values.mqtt.broker.wsPort | quote }}
             - name: SMQ_ES_URL
-              value: "{{ .Release.Name }}-nats:{{ .Values.defaults.natsPort }}"
+              value: {{ .Values.nats.enabled | ternary (printf "%s-nats:%d" .Release.Name (.Values.nats.config.nats.port | int )) .Values.nats.externalAddress }}
             - name: SMQ_MQTT_ADAPTER_MQTT_TARGET_HEALTH_CHECK
               value: http://localhost:8888/health
           livenessProbe:

diff --git a/charts/supermq/templates/auth-deployment.yaml b/charts/supermq/templates/auth-deployment.yaml
@@ -43,13 +43,13 @@ spec:
           imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.auth.image.pullPolicy }}
           env:
             - name: SMQ_JAEGER_URL
-              value: "http://{{ .Values.jaeger.fullnameOverride }}-collector:{{ .Values.jaeger.collector.service.otlp.http.port }}/v1/traces"
+              value: {{ .Values.jaeger.enabled | ternary (printf "http://%s-jaeger-collector:%d/v1/traces" .Release.Name (.Values.jaeger.collector.service.otlp.http.port | int )) .Values.jaeger.externalUrl }}
             - name: SMQ_JAEGER_TRACE_RATIO
-              value: {{ default .Values.defaults.jaegerTraceRatio .Values.auth.jaegerTraceRatio | quote }}
+              value: {{ default .Values.jaeger.traceRatio .Values.auth.jaegerTraceRatio | quote }}
             - name: SMQ_SEND_TELEMETRY
               value: {{ default .Values.defaults.sendTelemetry .Values.auth.sendTelemetry | quote }}
             - name: SMQ_ES_URL
-              value: "{{ .Release.Name }}-nats:{{ .Values.defaults.natsPort }}"
+              value: {{ .Values.nats.enabled | ternary (printf "%s-nats:%d" .Release.Name (.Values.nats.config.nats.port | int )) .Values.nats.externalAddress }}
             - name: SMQ_AUTH_LOG_LEVEL
               value: {{ default .Values.defaults.logLevel .Values.auth.logLevel | quote }}
             - name: SMQ_AUTH_GRPC_HOST

diff --git a/charts/supermq/templates/certs-deployment.yaml b/charts/supermq/templates/certs-deployment.yaml
@@ -34,9 +34,9 @@ spec:
           imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.certs.image.pullPolicy }}
           env:
             - name: SMQ_JAEGER_URL
-              value: "http://{{ .Values.jaeger.fullnameOverride }}-collector:{{ .Values.jaeger.collector.service.otlp.http.port }}/v1/traces"
+              value: {{ .Values.jaeger.enabled | ternary (printf "http://%s-jaeger-collector:%d/v1/traces" .Release.Name (.Values.jaeger.collector.service.otlp.http.port | int )) .Values.jaeger.externalUrl }}
             - name: SMQ_JAEGER_TRACE_RATIO
-              value: {{ default .Values.defaults.jaegerTraceRatio .Values.certs.jaegerTraceRatio | quote }}
+              value: {{ default .Values.jaeger.traceRatio .Values.certs.jaegerTraceRatio | quote }}
             - name: SMQ_SEND_TELEMETRY
               value: {{ default .Values.defaults.sendTelemetry .Values.certs.sendTelemetry | quote }}
             - name: SMQ_CERTS_LOG_LEVEL

diff --git a/charts/supermq/templates/channels-deployment.yaml b/charts/supermq/templates/channels-deployment.yaml
@@ -77,19 +77,19 @@ spec:
             - name: SMQ_GROUPS_GRPC_CLIENT_KEY
               value: {{ .Values.groups.grpcClientKey | quote }}
             - name: SMQ_DOMAINS_GRPC_URL
-              value: http://{{ .Release.Name }}-envoy:{{ .Values.domains.grpcPort }}
+              value: {{ .Release.Name }}-envoy:{{ .Values.domains.grpcPort }}
             - name: SMQ_DOMAINS_GRPC_TIMEOUT
               value: {{ .Values.domains.grpcTimeout | quote }}
             - name: SMQ_DOMAINS_GRPC_CLIENT_CERT
               value: {{ .Values.domains.grpcClientCert | quote }}
             - name: SMQ_DOMAINS_GRPC_CLIENT_KEY
               value: {{ .Values.domains.grpcClientKey | quote }}
             - name: SMQ_ES_URL
-              value: "{{ .Release.Name }}-nats:{{ .Values.defaults.natsPort }}"
+              value: {{ .Values.nats.enabled | ternary (printf "%s-nats:%d" .Release.Name (.Values.nats.config.nats.port | int )) .Values.nats.externalAddress }}
             - name: SMQ_JAEGER_URL
-              value: "http://{{ .Release.Name }}-jaeger-collector:{{ .Values.defaults.jaegerCollectorPort }}/v1/traces"
+              value: {{ .Values.jaeger.enabled | ternary (printf "http://%s-jaeger-collector:%d/v1/traces" .Release.Name (.Values.jaeger.collector.service.otlp.http.port | int )) .Values.jaeger.externalUrl }}
             - name: SMQ_JAEGER_TRACE_RATIO
-              value: {{ default .Values.defaults.jaegerTraceRatio .Values.channels.jaegerTraceRatio | quote  }}
+              value: {{ default .Values.jaeger.traceRatio .Values.channels.jaegerTraceRatio | quote  }}
             - name: SMQ_SEND_TELEMETRY
               value: {{ default .Values.defaults.sendTelemetry .Values.channels.sendTelemetry | quote  }}
             - name: SMQ_SPICEDB_PRE_SHARED_KEY

diff --git a/charts/supermq/templates/clients-deployment.yaml b/charts/supermq/templates/clients-deployment.yaml
@@ -33,9 +33,9 @@ spec:
           imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.clients.image.pullPolicy }}
           env:
             - name: SMQ_JAEGER_URL
-              value: "http://{{ .Release.Name }}-jaeger-collector:{{ .Values.defaults.jaegerCollectorPort }}/v1/traces"
+              value: {{ .Values.jaeger.enabled | ternary (printf "http://%s-jaeger-collector:%d/v1/traces" .Release.Name (.Values.jaeger.collector.service.otlp.http.port | int )) .Values.jaeger.externalUrl }}
             - name: SMQ_JAEGER_TRACE_RATIO
-              value: {{ default .Values.defaults.jaegerTraceRatio .Values.clients.jaegerTraceRatio | quote  }}
+              value: {{ default .Values.jaeger.traceRatio .Values.clients.jaegerTraceRatio | quote  }}
             - name: SMQ_SEND_TELEMETRY
               value: {{ default .Values.defaults.sendTelemetry .Values.clients.sendTelemetry | quote  }}
             - name: SMQ_CLIENTS_LOG_LEVEL
@@ -49,7 +49,13 @@ spec:
             - name: SMQ_CLIENTS_AUTH_HTTP_PORT
               value: {{ .Values.clients.authHttpPort | quote}}
             - name: SMQ_CLIENTS_CACHE_URL
-              value: redis://{{ .Release.Name }}-redis-clients-master:{{ .Values.clients.redisCachePort }}/0
+              {{- if .Values.redisclients.enabled }}
+              value: redis://{{ .Release.Name }}-redisclients-master:{{ .Values.redisclients.master.service.ports.redis	 }}/0
+              {{- else }}
+              value: {{ .Values.redisclients.externalUrl | quote }}
+              {{- end }}
+            - name: SMQ_CLIENTS_CACHE_KEY_DURATION
+              value: {{ .Values.redisclients.cacheKeyDuration | quote }}
             - name: SMQ_SPICEDB_SCHEMA_FILE
               value: /schema.zed
             - name: SMQ_CLIENTS_DB_HOST
@@ -67,13 +73,12 @@ spec:
             - name: SMQ_CLIENTS_DB_NAME
               value: {{ .Values.postgresqlclients.database | quote }}
             - name: SMQ_ES_URL
-              value: "{{ .Release.Name }}-nats:{{ .Values.defaults.natsPort }}"
+              value: {{ .Values.nats.enabled | ternary (printf "%s-nats:%d" .Release.Name (.Values.nats.config.nats.port | int )) .Values.nats.externalAddress }}
             - name: SMQ_CLIENTS_HTTP_HOST
               value: "0.0.0.0"
             - name: SMQ_CLIENTS_HTTP_PORT
               value: {{ .Values.clients.httpPort | quote }}
-            - name: SMQ_CLIENTS_CACHE_KEY_DURATION
-              value: {{ .Values.clients.cacheKeyduration | quote }}
+
             - name: SMQ_AUTH_GRPC_URL
               value: {{ .Release.Name }}-envoy:{{ .Values.auth.grpcPort }}
             - name: SMQ_CHANNELS_URL
@@ -95,7 +100,7 @@ spec:
             - name: SMQ_DOMAINS_GRPC_TIMEOUT
               value: {{ .Values.domains.grpcTimeout | quote }}
             - name: SMQ_DOMAINS_GRPC_URL
-              value: http://{{ .Release.Name }}-envoy:{{ .Values.domains.grpcPort }}
+              value: {{ .Release.Name }}-envoy:{{ .Values.domains.grpcPort }}
             - name: SMQ_SPICEDB_PRE_SHARED_KEY
               value: {{.Values.spicedb.grpc.presharedKey | quote }}
             - name: SMQ_SPICEDB_HOST

diff --git a/charts/supermq/templates/domains-deployment.yaml b/charts/supermq/templates/domains-deployment.yaml
@@ -66,9 +66,13 @@ spec:
             - name: SMQ_DOMAINS_DB_NAME
               value: {{ .Values.postgresqldomains.database | quote }}
             - name: SMQ_DOMAINS_CACHE_URL
-              value: redis://{{ .Release.Name }}-domains-redis:{{ .Values.domains.redisTCPPort }}/0
+              {{- if .Values.redisdomains.enabled }}
+              value: redis://{{ .Release.Name }}-redisdomains-master:{{ .Values.redisdomains.master.service.ports.redis	 }}/0
+              {{- else }}
+              value: {{ .Values.redisdomains.externalUrl | quote }}
+              {{- end }}
             - name: SMQ_DOMAINS_CACHE_KEY_DURATION
-              value: {{ .Values.domains.cacheKeyduration | quote }}
+              value: {{ .Values.redisdomains.cacheKeyDuration | quote }}
             - name: SMQ_AUTH_GRPC_URL
               value: {{ .Release.Name }}-envoy:{{ .Values.auth.grpcPort }}
             - name: SMQ_AUTH_GRPC_TIMEOUT
@@ -88,13 +92,13 @@ spec:
             - name: SMQ_CLIENTS_AUTH_GRPC_TIMEOUT
               value: {{ .Values.clients.grpcTimeout | quote }}
             - name: SMQ_JAEGER_URL
-              value: "http://{{ .Release.Name }}-jaeger-collector:4318/v1/traces"
+              value: {{ .Values.jaeger.enabled | ternary (printf "http://%s-jaeger-collector:%d/v1/traces" .Release.Name (.Values.jaeger.collector.service.otlp.http.port | int )) .Values.jaeger.externalUrl }}
             - name: SMQ_JAEGER_TRACE_RATIO
-              value: {{ default .Values.defaults.jaegerTraceRatio .Values.adapter_coap.jaegerTraceRatio | quote  }}
+              value: {{ default .Values.jaeger.traceRatio .Values.domains.jaegerTraceRatio | quote  }}
             - name: SMQ_SEND_TELEMETRY
               value: {{ default .Values.defaults.sendTelemetry .Values.users.sendTelemetry | quote  }}
             - name: SMQ_ES_URL
-              value: "{{ .Release.Name }}-nats:{{ .Values.defaults.natsPort }}"
+              value: {{ .Values.nats.enabled | ternary (printf "%s-nats:%d" .Release.Name (.Values.nats.config.nats.port | int )) .Values.nats.externalAddress }}
           volumeMounts:
             - name: spicedb-schema-zed
               mountPath: /schema.zed

diff --git a/charts/supermq/templates/groups-deployment.yaml b/charts/supermq/templates/groups-deployment.yaml
@@ -67,15 +67,15 @@ spec:
             - name: SMQ_CLIENTS_AUTH_GRPC_TIMEOUT
               value: {{ .Values.clients.grpcTimeout | quote }}
             - name: SMQ_DOMAINS_GRPC_URL
-              value: http://{{ .Release.Name }}-envoy:{{ .Values.domains.grpcPort | quote }}
+              value: {{ .Release.Name }}-envoy:{{ .Values.domains.grpcPort | quote }}
             - name: SMQ_DOMAINS_GRPC_TIMEOUT
               value: {{ .Values.domains.grpcTimeout | quote }}
             - name: SMQ_ES_URL
-              value: "{{ .Release.Name }}-nats:{{ .Values.defaults.natsPort }}"
+              value: {{ .Values.nats.enabled | ternary (printf "%s-nats:%d" .Release.Name (.Values.nats.config.nats.port | int )) .Values.nats.externalAddress }}
             - name: SMQ_JAEGER_URL
-              value: "http://{{ .Release.Name }}-jaeger-collector:{{ .Values.defaults.jaegerCollectorPort }}/v1/traces"
+              value: {{ .Values.jaeger.enabled | ternary (printf "http://%s-jaeger-collector:%d/v1/traces" .Release.Name (.Values.jaeger.collector.service.otlp.http.port | int )) .Values.jaeger.externalUrl }}
             - name: SMQ_JAEGER_TRACE_RATIO
-              value: {{ default .Values.defaults.jaegerTraceRatio .Values.groups.jaegerTraceRatio | quote }}
+              value: {{ default .Values.jaeger.traceRatio .Values.groups.jaegerTraceRatio | quote }}
             - name: SMQ_SEND_TELEMETRY
               value: {{ default .Values.defaults.sendTelemetry .Values.groups.sendTelemetry | quote }}
             - name: SMQ_AUTH_GRPC_URL