Skip to content

Commit 910a340

Browse files
JeffMboyaJeffMboya
committed
Remove bootstrap
Remove timescale Update users env Rename things to clients Rename things to clients Rename MG to SMQ Rename magistrala to supermq Update docs Rename magistrala to supermq Update adapter_coap Update debug level Update env files Add spicedb schema file var Add domains Add channels Add channels Add groups Update chart.yaml Update coap adapter Update chart.lock Fix cassandra Fix auth Fix http-adapter Fix channels Fix clients Add schema to domains Fix users Rename schema file Fix auth pvc replicas Fix groups and domains remove unnecessary variables rename magistrala to supermq rename magistrala to supermq rename magistrala to supermq Signed-off-by: JeffMboya <[email protected]> update chart version Signed-off-by: JeffMboya <[email protected]> Add ws Signed-off-by: JeffMboya <[email protected]> Add log collection Signed-off-by: JeffMboya <[email protected]> Fix fluent-bit parser error in mg Signed-off-by: JeffMboya <[email protected]> Fix flush timeout in fluent-bit Signed-off-by: JeffMboya <[email protected]> Fix flush timeout in fluent-bit Signed-off-by: JeffMboya <[email protected]> Remove repomix output Signed-off-by: JeffMboya <[email protected]> change loge level to error Signed-off-by: JeffMboya <[email protected]> use simpler secret key Signed-off-by: JeffMboya <[email protected]> Use official helm charts Signed-off-by: JeffMboya <[email protected]> Fix loki bucken names Signed-off-by: JeffMboya <[email protected]> Fix Cannot run scalable targets error Signed-off-by: JeffMboya <[email protected]> Fix fluent bit host Signed-off-by: JeffMboya <[email protected]> Fix fluent bit configmap Signed-off-by: JeffMboya <[email protected]> Fix fluentbit http buffer size; fix loki DNS resolution Signed-off-by: JeffMboya <[email protected]> switch to loki-gateway Signed-off-by: JeffMboya <[email protected]> Disable gateway Signed-off-by: JeffMboya <[email protected]> USe seperate fluentbit config file Signed-off-by: JeffMboya <[email protected]> Add gRPC routing for services Signed-off-by: JeffMboya <[email protected]> Add gRPC routing for services Signed-off-by: JeffMboya <[email protected]> Fix CI Signed-off-by: JeffMboya <[email protected]> Fix CI Signed-off-by: JeffMboya <[email protected]> Remove unnecessary file Signed-off-by: JeffMboya <[email protected]> Add gRPC routing for services Signed-off-by: JeffMboya <[email protected]> Fix envoy Signed-off-by: JeffMboya <[email protected]> revert to add fluentbit config to values.yaml Signed-off-by: JeffMboya <[email protected]> Fix envoy Signed-off-by: JeffMboya <[email protected]> Fix clients and channels Signed-off-by: JeffMboya <[email protected]> Update loki version Signed-off-by: JeffMboya <[email protected]> Fix fluentbit - loki connection Signed-off-by: JeffMboya <[email protected]> Remove extra loki config Signed-off-by: JeffMboya <[email protected]> Remove extra loki config Signed-off-by: JeffMboya <[email protected]> Use seperate file for loki override Signed-off-by: JeffMboya <[email protected]> Disable k8s exclusion rule Signed-off-by: JeffMboya <[email protected]> Fix prometheus Signed-off-by: JeffMboya <[email protected]> Fix prometheus ports Signed-off-by: JeffMboya <[email protected]> Fix Prometheus failing to access its Kubernetes ServiceAccount token and CA certificate Signed-off-by: JeffMboya <[email protected]> Remove invitations Signed-off-by: JeffMboya <[email protected]> Update Ingress configuration for services Signed-off-by: JeffMboya <[email protected]> Update helm docs Signed-off-by: JeffMboya <[email protected]> change auth from statefulset to deployment kind Signed-off-by: JeffMboya <[email protected]> remove deuplicate definition for spicedb-schema-zed Signed-off-by: JeffMboya <[email protected]> Rename SMQ_CLIENTS_AUTH_GRPC_ to SMQ_CLIENTS_GRPC_ Signed-off-by: JeffMboya <[email protected]>
1 parent 05c95d9 commit 910a340

19 files changed

+473
-443
lines changed

‎.github/workflows/lint-test.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ jobs:
2525
helm repo add jaegertracing https://jaegertracing.github.io/helm-charts
2626
helm repo add bitnami https://charts.bitnami.com/bitnami
2727
helm repo add hashicorp https://helm.releases.hashicorp.com
28+
helm repo add grafana https://grafana.github.io/helm-charts
2829
helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
30+
helm repo add fluent https://fluent.github.io/helm-charts
2931
helm repo update
3032
3133
- name: Update Helm dependencies

‎charts/supermq/Chart.lock

+11-5
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,24 @@ dependencies:
4040
version: 15.2.10
4141
- name: postgresql
4242
repository: https://charts.bitnami.com/bitnami
43-
version: 15.2.10
44-
- name: redis
43+
version: 12.5.6
44+
- name: postgresql
4545
repository: https://charts.bitnami.com/bitnami
46-
version: 19.6.2
46+
version: 12.5.6
4747
- name: redis
4848
repository: https://charts.bitnami.com/bitnami
4949
version: 19.6.2
5050
- name: vault
5151
repository: https://helm.releases.hashicorp.com
5252
version: 0.28.1
53+
- name: grafana
54+
repository: https://grafana.github.io/helm-charts
55+
version: 8.9.0
5356
- name: prometheus
5457
repository: https://prometheus-community.github.io/helm-charts
5558
version: 27.3.0
56-
digest: sha256:e4d212053cf22053c2e17b4b279df67cce456b937bbd51c40a232ddb2acb092a
57-
generated: "2025-03-06T14:16:27.545530063+03:00"
59+
- name: fluent-bit
60+
repository: https://fluent.github.io/helm-charts
61+
version: 0.48.5
62+
digest: sha256:139785f47f262da833f6a174486ff188b9d6c8816c9c873f3ae0fadf319b0426
63+
generated: "2025-02-15T13:00:54.154848725+03:00"

‎charts/supermq/Chart.yaml

+36-13
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: Supermq
66
description: Event-driven Infrastructure for Modern Cloud
77
icon: https://avatars1.githubusercontent.com/u/13207490
88
type: application
9-
version: 0.16.2
9+
version: 0.16.0
1010
appVersion: "0.16.0"
1111
home: https://abstractmachines.fr/supermq.html
1212
sources:
@@ -55,6 +55,24 @@ dependencies:
5555
alias: postgresqlchannels
5656
condition: postgresqlchannels.enabled
5757

58+
- name: postgresql
59+
version: "12.5.6"
60+
repository: "@bitnami"
61+
alias: postgresqlclients
62+
condition: postgresqlclients.enabled
63+
64+
- name: postgresql
65+
version: "12.5.6"
66+
repository: "@bitnami"
67+
alias: postgresqldomains
68+
condition: postgresqldomains.enabled
69+
70+
- name: postgresql
71+
version: "12.5.6"
72+
repository: "@bitnami"
73+
alias: postgresqlgroups
74+
condition: postgresqlgroups.enabled
75+
5876
- name: postgresql
5977
version: "15.2.10"
6078
repository: "@bitnami"
@@ -80,43 +98,48 @@ dependencies:
8098
condition: postgresqlusers.enabled
8199

82100
- name: postgresql
83-
version: "15.2.10"
101+
version: "12.5.6"
84102
repository: "@bitnami"
85103
alias: postgresqlcerts
86104
condition: postgresqlcerts.enabled
87105

88106
- name: postgresql
89-
version: "15.2.10"
107+
version: "12.5.6"
90108
repository: "@bitnami"
91109
alias: postgresqljournal
92110
condition: postgresqljournal.enabled
93111

94112
- name: postgresql
95113
version: "15.2.10"
96114
repository: "@bitnami"
97-
alias: postgresqlbackend
98-
condition: postgresqlbackend.enabled
115+
alias: postgresqlui
116+
condition: postgresqlui.enabled
99117

100118
- name: redis
101119
version: "19.6.2"
102120
repository: "@bitnami"
103-
alias: redisclients
104-
condition: redisclients.enabled
105-
106-
- name: redis
107-
version: "19.6.2"
108-
repository: "@bitnami"
109-
alias: redisdomains
110-
condition: redisdomains.enabled
121+
alias: redis-clients
111122

112123
- name: vault
113124
version: "0.28.1"
114125
repository: "@hashicorp"
115126
alias: "vault"
116127
condition: vault.enabled
117128

129+
- name: grafana
130+
version: "8.9.0"
131+
repository: "https://grafana.github.io/helm-charts"
132+
alias: grafana
133+
condition: grafana.enabled
134+
118135
- name: prometheus
119136
version: "27.3.0"
120137
repository: "https://prometheus-community.github.io/helm-charts"
121138
alias: prometheus
122139
condition: prometheus.enabled
140+
141+
- name: fluent-bit
142+
version: "0.48.5"
143+
repository: "https://fluent.github.io/helm-charts"
144+
alias: fluent-bit
145+
condition: fluent-bit.enabled

‎charts/supermq/templates/_helpers.tpl

+3-8
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ SPDX-License-Identifier: Apache-2.0
66
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
77
{{- end -}}
88

9+
<<<<<<< HEAD
910

1011
{{- define "cassandra.host" -}}
1112
{{- if .Values.provisionDataStore.cassandra -}}
@@ -19,6 +20,8 @@ SPDX-License-Identifier: Apache-2.0
1920
{{- end -}}
2021
{{- end -}}
2122

23+
=======
24+
>>>>>>> 9436bc2 (Remove bootstrap)
2225
{{- define "supermq.fullname" -}}
2326
{{- if .Values.fullnameOverride -}}
2427
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
@@ -41,14 +44,6 @@ tls.key: {{ $cert.Key | b64enc }}
4144
{{- end -}}
4245

4346

44-
{{- define "supermq.hostname" -}}
45-
{{- if .Values.ingress.tls -}}
46-
https://{{ .Values.ingress.hostname }}
47-
{{- else -}}
48-
http://{{ .Values.ingress.hostname }}
49-
{{- end -}}
50-
{{- end -}}
51-
5247
{{- define "validateSpiceDBDatastoreEngine" -}}
5348
{{- if and (not (eq . "memory")) (not (eq . "postgres")) -}}
5449
{{- fail "Invalid value for .Values.spicedb.datastore.engine. Must be 'memory' or 'postgres'." -}}

‎charts/supermq/templates/adapter_coap-deployment.yaml

+4-5
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ spec:
3333
imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.adapter_coap.image.pullPolicy }}
3434
env:
3535
- name: SMQ_JAEGER_URL
36-
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 }}
36+
value: "http://{{ .Release.Name }}-jaeger-collector:{{ .Values.defaults.jaegerCollectorPort }}/v1/traces"
3737
- name: SMQ_JAEGER_TRACE_RATIO
38-
value: {{ default .Values.jaeger.traceRatio .Values.adapter_coap.jaegerTraceRatio | quote }}
38+
value: {{ default .Values.defaults.jaegerTraceRatio .Values.adapter_coap.jaegerTraceRatio | quote }}
3939
- name: SMQ_SEND_TELEMETRY
4040
value: {{ default .Values.defaults.sendTelemetry .Values.adapter_coap.sendTelemetry | quote }}
4141
- name: SMQ_MESSAGE_BROKER_URL
42-
value: {{ .Values.nats.enabled | ternary (printf "nats://%s-nats:%d" .Release.Name (.Values.nats.config.nats.port | int )) .Values.nats.externalAddress }}
42+
value: nats://{{ .Release.Name }}-nats:{{ .Values.defaults.natsPort }}
4343
- name: SMQ_CLIENTS_GRPC_URL
4444
value: {{ .Release.Name }}-envoy:{{ .Values.clients.authGrpcPort }}
4545
- name: SMQ_CLIENTS_GRPC_TIMEOUT
@@ -59,8 +59,7 @@ spec:
5959
- name: SMQ_COAP_ADAPTER_PORT
6060
value: {{ .Values.adapter_coap.port | quote }}
6161
- name: SMQ_ES_URL
62-
value: {{ .Values.nats.enabled | ternary (printf "%s-nats:%d" .Release.Name (.Values.nats.config.nats.port | int )) .Values.nats.externalAddress }}
63-
62+
value: {{ .Values.defaults.eventStreamURL | quote }}
6463
ports:
6564
- containerPort: {{ .Values.adapter_coap.port }}
6665
protocol: UDP

‎charts/supermq/templates/adapter_http-deployment.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ kind: Deployment
66
metadata:
77
name: {{ .Release.Name }}-adapter-http
88
spec:
9+
<<<<<<< HEAD
910
replicas: {{ default .Values.defaults.replicaCount .Values.adapter_http.replicaCount | int64 }}
11+
=======
12+
>>>>>>> 9436bc2 (Remove bootstrap)
1013
selector:
1114
matchLabels:
1215
app: {{ .Release.Name }}
@@ -33,11 +36,19 @@ spec:
3336
imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.adapter_http.image.pullPolicy }}
3437
env:
3538
- name: SMQ_JAEGER_URL
39+
<<<<<<< HEAD
3640
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 }}
3741
- name: SMQ_JAEGER_TRACE_RATIO
3842
value: {{ default .Values.jaeger.traceRatio .Values.adapter_http.jaegerTraceRatio | float64 | quote }}
3943
- name: SMQ_SEND_TELEMETRY
4044
value: {{ default .Values.defaults.sendTelemetry .Values.adapter_http.sendTelemetry | quote }}
45+
=======
46+
value: "http://{{ .Release.Name }}-jaeger-collector:{{ .Values.defaults.jaegerCollectorPort }}/v1/traces"
47+
- name: SMQ_JAEGER_TRACE_RATIO
48+
value: {{ default .Values.defaults.jaegerTraceRatio .Values.users.jaegerTraceRatio | quote }}
49+
- name: SMQ_SEND_TELEMETRY
50+
value: {{ default .Values.defaults.sendTelemetry .Values.users.sendTelemetry | quote }}
51+
>>>>>>> 9436bc2 (Remove bootstrap)
4152
- name: SMQ_HTTP_ADAPTER_LOG_LEVEL
4253
value: {{ default .Values.defaults.logLevel .Values.adapter_http.logLevel | quote }}
4354
- name: SMQ_HTTP_ADAPTER_HOST
@@ -57,9 +68,15 @@ spec:
5768
- name: SMQ_AUTH_GRPC_TIMEOUT
5869
value: {{ .Values.auth.grpcTimeout | quote }}
5970
- name: SMQ_MESSAGE_BROKER_URL
71+
<<<<<<< HEAD
6072
value: {{ .Values.nats.enabled | ternary (printf "nats://%s-nats:%d" .Release.Name (.Values.nats.config.nats.port | int )) .Values.nats.externalAddress }}
6173
- name: SMQ_ES_URL
6274
value: {{ .Values.nats.enabled | ternary (printf "%s-nats:%d" .Release.Name (.Values.nats.config.nats.port | int )) .Values.nats.externalAddress }}
75+
=======
76+
value: nats://{{ .Release.Name }}-nats:{{ .Values.defaults.natsPort }}
77+
- name: SMQ_ES_URL
78+
value: {{ .Values.defaults.eventStreamURL | quote }}
79+
>>>>>>> 9436bc2 (Remove bootstrap)
6380
ports:
6481
- containerPort: {{ .Values.adapter_http.httpPort }}
6582
protocol: TCP

‎charts/supermq/templates/adapter_mqtt-statefulstet.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,19 @@ spec:
195195
- name: SMQ_CHANNELS_GRPC_TIMEOUT
196196
value: {{ .Values.channels.grpcTimeout | quote }}
197197
- name: SMQ_MESSAGE_BROKER_URL
198+
<<<<<<< HEAD
198199
value: {{ .Values.nats.enabled | ternary (printf "nats://%s-nats:%d" .Release.Name (.Values.nats.config.nats.port | int )) .Values.nats.externalAddress }}
199200
- name: SMQ_JAEGER_URL
200201
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 }}
201202
- name: SMQ_JAEGER_TRACE_RATIO
202203
value: {{ default .Values.jaeger.traceRatio .Values.mqtt.adapter.jaegerTraceRatio | quote }}
204+
=======
205+
value: nats://{{ .Release.Name }}-nats:{{ .Values.defaults.natsPort }}
206+
- name: SMQ_JAEGER_URL
207+
value: "http://{{ .Release.Name }}-jaeger-collector:{{ .Values.defaults.jaegerCollectorPort }}/v1/traces"
208+
- name: SMQ_JAEGER_TRACE_RATIO
209+
value: {{ default .Values.defaults.jaegerTraceRatio .Values.adapter_coap.jaegerTraceRatio | quote }}
210+
>>>>>>> 9436bc2 (Remove bootstrap)
203211
- name: SMQ_MQTT_ADAPTER_MQTT_TARGET_HOST
204212
value: localhost
205213
- name: SMQ_SEND_TELEMETRY
@@ -211,7 +219,11 @@ spec:
211219
- name: SMQ_MQTT_ADAPTER_WS_TARGET_PORT
212220
value: {{ .Values.mqtt.broker.wsPort | quote }}
213221
- name: SMQ_ES_URL
222+
<<<<<<< HEAD
214223
value: {{ .Values.nats.enabled | ternary (printf "%s-nats:%d" .Release.Name (.Values.nats.config.nats.port | int )) .Values.nats.externalAddress }}
224+
=======
225+
value: {{ .Values.defaults.eventStreamURL | quote }}
226+
>>>>>>> 9436bc2 (Remove bootstrap)
215227
- name: SMQ_MQTT_ADAPTER_MQTT_TARGET_HEALTH_CHECK
216228
value: http://localhost:8888/health
217229
livenessProbe:

‎charts/supermq/templates/auth-deployment.yaml

+3-11
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ spec:
4343
imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.auth.image.pullPolicy }}
4444
env:
4545
- name: SMQ_JAEGER_URL
46-
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 }}
46+
value: "http://{{ .Values.jaeger.fullnameOverride }}-collector:{{ .Values.jaeger.collector.service.otlp.http.port }}/v1/traces"
4747
- name: SMQ_JAEGER_TRACE_RATIO
48-
value: {{ default .Values.jaeger.traceRatio .Values.auth.jaegerTraceRatio | quote }}
48+
value: {{ default .Values.defaults.jaegerTraceRatio .Values.auth.jaegerTraceRatio | quote }}
4949
- name: SMQ_SEND_TELEMETRY
5050
value: {{ default .Values.defaults.sendTelemetry .Values.auth.sendTelemetry | quote }}
5151
- name: SMQ_ES_URL
52-
value: {{ .Values.nats.enabled | ternary (printf "%s-nats:%d" .Release.Name (.Values.nats.config.nats.port | int )) .Values.nats.externalAddress }}
52+
value: {{ .Values.defaults.eventStreamURL | quote }}
5353
- name: SMQ_AUTH_LOG_LEVEL
5454
value: {{ default .Values.defaults.logLevel .Values.auth.logLevel | quote }}
5555
- name: SMQ_AUTH_GRPC_HOST
@@ -84,14 +84,6 @@ spec:
8484
value: {{ .Release.Name }}-spicedb-envoy
8585
- name: SMQ_SPICEDB_PORT
8686
value: {{ .Values.spicedb.grpc.port | quote }}
87-
- name: SMQ_AUTH_DB_SSL_MODE
88-
value: {{ .Values.auth.sslMode | quote }}
89-
- name: SMQ_AUTH_DB_SSL_CERT
90-
value: {{ .Values.auth.sslCert | quote }}
91-
- name: SMQ_AUTH_DB_SSL_KEY
92-
value: {{ .Values.auth.sslKey | quote }}
93-
- name: SMQ_AUTH_DB_SSL_ROOT_CERT
94-
value: {{ .Values.auth.sslRootCert | quote }}
9587
- name: SMQ_SPICEDB_SCHEMA_FILE
9688
value: /schema.zed
9789
- name: SMQ_SPICEDB_PRE_SHARED_KEY

‎charts/supermq/templates/certs-deployment.yaml

+3-13
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ spec:
3434
imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.certs.image.pullPolicy }}
3535
env:
3636
- name: SMQ_JAEGER_URL
37-
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 }}
37+
value: "http://{{ .Values.jaeger.fullnameOverride }}-collector:{{ .Values.jaeger.collector.service.otlp.http.port }}/v1/traces"
3838
- name: SMQ_JAEGER_TRACE_RATIO
39-
value: {{ default .Values.jaeger.traceRatio .Values.certs.jaegerTraceRatio | quote }}
39+
value: {{ default .Values.defaults.jaegerTraceRatio .Values.certs.jaegerTraceRatio | quote }}
4040
- name: SMQ_SEND_TELEMETRY
4141
value: {{ default .Values.defaults.sendTelemetry .Values.certs.sendTelemetry | quote }}
4242
- name: SMQ_CERTS_LOG_LEVEL
@@ -56,7 +56,7 @@ spec:
5656
- name: SMQ_AUTH_GRPC_TIMEOUT
5757
value: {{ .Values.auth.grpcTimeout | quote }}
5858
- name: SMQ_CLIENTS_URL
59-
value: {{ .Release.Name }}-clients:{{ .Values.clients.httpPort }}
59+
value: http://{{ .Release.Name }}-clients:{{ .Values.clients.httpPort }}
6060
- name: SMQ_CERTS_DB_HOST
6161
{{- if .Values.postgresqlcerts.enabled }}
6262
value: {{ .Release.Name }}-postgresqlcerts
@@ -71,16 +71,6 @@ spec:
7171
value: {{ .Values.postgresqlcerts.username | quote }}
7272
- name: SMQ_CERTS_DB_PASS
7373
value: {{ .Values.postgresqlcerts.password | quote }}
74-
- name: AM_CERTS_DB_SSL_MODE
75-
value: {{ .Values.certs.sslMode | quote }}
76-
- name: SMQ_CERTS_DB_SSL_MODE
77-
value: {{ .Values.certs.sslMode | quote }}
78-
- name: SMQ_CERTS_DB_SSL_CERT
79-
value: {{ .Values.certs.sslCert | quote }}
80-
- name: SMQ_CERTS_DB_SSL_KEY
81-
value: {{ .Values.certs.sslKey | quote }}
82-
- name: SMQ_CERTS_DB_SSL_ROOT_CERT
83-
value: {{ .Values.certs.sslRootCert | quote }}
8474
- name: SMQ_CERTS_SIGN_CA_PATH
8575
value: {{ .Values.certs.signCAPath }}
8676
- name: SMQ_CERTS_SIGN_CA_KEY_PATH

‎charts/supermq/templates/channels-deployment.yaml

+10-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ kind: Deployment
66
metadata:
77
name: {{ .Release.Name }}-channels
88
spec:
9-
replicas: {{ default .Values.defaults.replicaCount .Values.channels.replicaCount | int64 }}
109
selector:
1110
matchLabels:
1211
app: {{ .Release.Name }}
@@ -50,6 +49,7 @@ spec:
5049
value: {{ .Values.postgresqlchannels.username | quote }}
5150
- name: SMQ_CHANNELS_DB_PASS
5251
value: {{ .Values.postgresqlchannels.password | quote }}
52+
<<<<<<< HEAD
5353
- name: SMQ_CHANNELS_DB_SSL_MODE
5454
value: {{ .Values.channels.sslMode | quote }}
5555
- name: SMQ_CHANNELS_DB_SSL_CERT
@@ -58,6 +58,8 @@ spec:
5858
value: {{ .Values.channels.sslKey | quote }}
5959
- name: SMQ_CHANNELS_DB_SSL_ROOT_CERT
6060
value: {{ .Values.channels.sslRootCert | quote }}
61+
=======
62+
>>>>>>> 9436bc2 (Remove bootstrap)
6163
- name: SMQ_SPICEDB_SCHEMA_FILE
6264
value: /schema.zed
6365
- name : SMQ_AUTH_GRPC_URL
@@ -85,19 +87,23 @@ spec:
8587
- name: SMQ_GROUPS_GRPC_CLIENT_KEY
8688
value: {{ .Values.groups.grpcClientKey | quote }}
8789
- name: SMQ_DOMAINS_GRPC_URL
90+
<<<<<<< HEAD
8891
value: {{ .Release.Name }}-envoy:{{ .Values.domains.grpcPort }}
92+
=======
93+
value: http://{{ .Release.Name }}-envoy:{{ .Values.domains.grpcPort }}
94+
>>>>>>> 9436bc2 (Remove bootstrap)
8995
- name: SMQ_DOMAINS_GRPC_TIMEOUT
9096
value: {{ .Values.domains.grpcTimeout | quote }}
9197
- name: SMQ_DOMAINS_GRPC_CLIENT_CERT
9298
value: {{ .Values.domains.grpcClientCert | quote }}
9399
- name: SMQ_DOMAINS_GRPC_CLIENT_KEY
94100
value: {{ .Values.domains.grpcClientKey | quote }}
95101
- name: SMQ_ES_URL
96-
value: {{ .Values.nats.enabled | ternary (printf "%s-nats:%d" .Release.Name (.Values.nats.config.nats.port | int )) .Values.nats.externalAddress }}
102+
value: {{ .Values.defaults.eventStreamURL | quote }}
97103
- name: SMQ_JAEGER_URL
98-
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 }}
104+
value: "http://{{ .Release.Name }}-jaeger-collector:{{ .Values.defaults.jaegerCollectorPort }}/v1/traces"
99105
- name: SMQ_JAEGER_TRACE_RATIO
100-
value: {{ default .Values.jaeger.traceRatio .Values.channels.jaegerTraceRatio | quote }}
106+
value: {{ default .Values.defaults.jaegerTraceRatio .Values.channels.jaegerTraceRatio | quote }}
101107
- name: SMQ_SEND_TELEMETRY
102108
value: {{ default .Values.defaults.sendTelemetry .Values.channels.sendTelemetry | quote }}
103109
- name: SMQ_SPICEDB_PRE_SHARED_KEY

0 commit comments

Comments
 (0)