Skip to content

Commit

Permalink
Rename MG to SMQ
Browse files Browse the repository at this point in the history
  • Loading branch information
JeffMboya committed Jan 23, 2025
1 parent c0c08e9 commit 7e7c727
Show file tree
Hide file tree
Showing 8 changed files with 123 additions and 123 deletions.
16 changes: 8 additions & 8 deletions charts/magistrala/templates/adapter_coap-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,21 @@ spec:
image: "{{ default (printf "%s/coap" .Values.defaults.image.rootRepository) .Values.adapter_coap.image.repository }}:{{ default .Values.defaults.image.tag .Values.adapter_coap.image.tag }}"
imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.adapter_coap.image.pullPolicy }}
env:
- name: MG_JAEGER_URL
- name: SMQ_JAEGER_URL
value: "http://{{ .Release.Name }}-jaeger-collector:{{ .Values.defaults.jaegerCollectorPort }}/v1/traces"
- name: MG_MESSAGE_BROKER_URL
- name: SMQ_MESSAGE_BROKER_URL
value: nats://{{ .Release.Name }}-nats:{{ .Values.defaults.natsPort }}
- name: MG_THINGS_AUTH_GRPC_URL
- name: SMQ_THINGS_AUTH_GRPC_URL
value: {{ .Release.Name }}-envoy:{{ .Values.clients.authGrpcPort }}
- name: MG_COAP_ADAPTER_LOG_LEVEL
- name: SMQ_COAP_ADAPTER_LOG_LEVEL
value: {{ default .Values.defaults.logLevel .Values.adapter_coap.logLevel | quote }}
- name: MG_COAP_ADAPTER_HTTP_HOST
- name: SMQ_COAP_ADAPTER_HTTP_HOST
value: "0.0.0.0"
- name: MG_COAP_ADAPTER_HTTP_PORT
- name: SMQ_COAP_ADAPTER_HTTP_PORT
value: {{ .Values.adapter_coap.port | quote }}
- name: MG_COAP_ADAPTER_HOST
- name: SMQ_COAP_ADAPTER_HOST
value: "0.0.0.0"
- name: MG_COAP_ADAPTER_PORT
- name: SMQ_COAP_ADAPTER_PORT
value: {{ .Values.adapter_coap.port | quote }}
ports:
- containerPort: {{ .Values.adapter_coap.port }}
Expand Down
12 changes: 6 additions & 6 deletions charts/magistrala/templates/adapter_http-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@ spec:
image: "{{ default (printf "%s/http" .Values.defaults.image.rootRepository) .Values.adapter_http.image.repository }}:{{ default .Values.defaults.image.tag .Values.adapter_http.image.tag }}"
imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.adapter_http.image.pullPolicy }}
env:
- name: MG_JAEGER_URL
- name: SMQ_JAEGER_URL
value: "http://{{ .Release.Name }}-jaeger-collector:{{ .Values.defaults.jaegerCollectorPort }}/v1/traces"
- name: MG_HTTP_ADAPTER_LOG_LEVEL
- name: SMQ_HTTP_ADAPTER_LOG_LEVEL
value: {{ default .Values.defaults.logLevel .Values.adapter_http.logLevel | quote }}
- name: MG_HTTP_ADAPTER_HOST
- name: SMQ_HTTP_ADAPTER_HOST
value: "0.0.0.0"
- name: MG_HTTP_ADAPTER_PORT
- name: SMQ_HTTP_ADAPTER_PORT
value: {{ .Values.adapter_http.httpPort | quote }}
- name: MG_MESSAGE_BROKER_URL
- name: SMQ_MESSAGE_BROKER_URL
value: nats://{{ .Release.Name }}-nats:{{ .Values.defaults.natsPort }}
- name: MG_THINGS_AUTH_GRPC_URL
- name: SMQ_THINGS_AUTH_GRPC_URL
value: {{ .Release.Name }}-envoy:{{ .Values.clients.authGrpcPort }}
ports:
- containerPort: {{ .Values.adapter_http.httpPort }}
Expand Down
32 changes: 16 additions & 16 deletions charts/magistrala/templates/adapter_mqtt-statefulstet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,19 @@ spec:
- name: data
mountPath: /vernemq/data
env:
- name: MG_MQTT_ADAPTER_LOG_LEVEL
- name: SMQ_MQTT_ADAPTER_LOG_LEVEL
value: {{ .Values.mqtt.broker.logLevel }}
- name: MY_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: MG_MQTT_INSTANCE_ID
- name: SMQ_MQTT_INSTANCE_ID
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: DOCKER_VERNEMQ_LOG__CONSOLE__LEVEL
value: {{ default .Values.defaults.logLevel .Values.mqtt.broker.logLevel }}
- name: MG_MQTT_VERNEMQ_GRPC_POOL_SIZE
- name: SMQ_MQTT_VERNEMQ_GRPC_POOL_SIZE
value: "1000"
- name: DOCKER_VERNEMQ_ALLOW_ANONYMOUS
value: "on"
Expand Down Expand Up @@ -174,31 +174,31 @@ spec:
stdin: true
tty: true
env:
- name: MG_MQTT_ADAPTER_LOG_LEVEL
- name: SMQ_MQTT_ADAPTER_LOG_LEVEL
value: {{ default .Values.defaults.logLevel .Values.mqtt.adapter.logLevel }}
- name: MG_MQTT_ADAPTER_MQTT_PORT
- name: SMQ_MQTT_ADAPTER_MQTT_PORT
value: {{ .Values.mqtt.adapter.mqttPort | quote }}
- name: MG_MQTT_ADAPTER_WS_PORT
- name: SMQ_MQTT_ADAPTER_WS_PORT
value: {{ .Values.mqtt.adapter.wsPort | quote }}
- name: MG_MESSAGE_BROKER_URL
- name: SMQ_MESSAGE_BROKER_URL
value: nats://{{ .Release.Name }}-nats:{{ .Values.defaults.natsPort }}
- name: MG_THINGS_AUTH_GRPC_URL
- name: SMQ_THINGS_AUTH_GRPC_URL
value: {{ .Release.Name }}-envoy:{{ .Values.clients.authGrpcPort }}
- name: MG_JAEGER_URL
- name: SMQ_JAEGER_URL
value: "http://{{ .Release.Name }}-jaeger-collector:{{ .Values.defaults.jaegerCollectorPort }}/v1/traces"
- name: MG_MQTT_ADAPTER_MQTT_TARGET_HOST
- name: SMQ_MQTT_ADAPTER_MQTT_TARGET_HOST
value: localhost
- name: MG_MQTT_ADAPTER_MQTT_TARGET_PORT
- name: SMQ_MQTT_ADAPTER_MQTT_TARGET_PORT
value: {{ .Values.mqtt.broker.mqttPort | quote }}
- name: MG_MQTT_ADAPTER_WS_TARGET_HOST
- name: SMQ_MQTT_ADAPTER_WS_TARGET_HOST
value: localhost
- name: MG_MQTT_ADAPTER_WS_TARGET_PORT
- name: SMQ_MQTT_ADAPTER_WS_TARGET_PORT
value: {{ .Values.mqtt.broker.wsPort | quote }}
- name: MG_MQTT_ADAPTER_THINGS_TIMEOUT
- name: SMQ_MQTT_ADAPTER_THINGS_TIMEOUT
value: "15"
- name: MG_ES_URL
- name: SMQ_ES_URL
value: {{ .Values.defaults.eventStreamURL | quote }}
- name: MG_MQTT_ADAPTER_MQTT_TARGET_HEALTH_CHECK
- name: SMQ_MQTT_ADAPTER_MQTT_TARGET_HEALTH_CHECK
value: http://localhost:8888/health
livenessProbe:
failureThreshold: 3
Expand Down
44 changes: 22 additions & 22 deletions charts/magistrala/templates/auth-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,53 +40,53 @@ spec:
image: "{{ default (printf "%s/auth" .Values.defaults.image.rootRepository) .Values.auth.image.repository }}:{{ default .Values.defaults.image.tag .Values.auth.image.tag }}"
imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.auth.image.pullPolicy }}
env:
- name: MG_JAEGER_URL
- name: SMQ_JAEGER_URL
value: "http://{{ .Values.jaeger.fullnameOverride }}-collector:{{ .Values.jaeger.collector.service.otlp.http.port }}/v1/traces"
- name: MG_JAEGER_TRACE_RATIO
- name: SMQ_JAEGER_TRACE_RATIO
value: {{ default .Values.defaults.jaegerTraceRatio .Values.auth.jaegerTraceRatio | quote }}
- name: MG_SEND_TELEMETRY
- name: SMQ_SEND_TELEMETRY
value: {{ default .Values.defaults.sendTelemetry .Values.auth.sendTelemetry | quote }}
- name: MG_ES_URL
- name: SMQ_ES_URL
value: {{ .Values.defaults.eventStreamURL | quote }}
- name: MG_AUTH_LOG_LEVEL
- name: SMQ_AUTH_LOG_LEVEL
value: {{ default .Values.defaults.logLevel .Values.auth.logLevel | quote }}
- name: MG_AUTH_GRPC_HOST
- name: SMQ_AUTH_GRPC_HOST
value: "0.0.0.0"
- name: MG_AUTH_GRPC_PORT
- name: SMQ_AUTH_GRPC_PORT
value: {{ .Values.auth.grpcPort | quote }}
- name: MG_AUTH_HTTP_HOST
- name: SMQ_AUTH_HTTP_HOST
value: "0.0.0.0"
- name: MG_AUTH_HTTP_PORT
- name: SMQ_AUTH_HTTP_PORT
value: {{ .Values.auth.httpPort | quote }}
- name: MG_AUTH_SECRET
- name: SMQ_AUTH_SECRET
value: {{ .Values.auth.secret | quote }}
- name: MG_AUTH_ACCESS_TOKEN_DURATION
- name: SMQ_AUTH_ACCESS_TOKEN_DURATION
value: {{ .Values.auth.accessTokenDuration | quote }}
- name: MG_AUTH_REFRESH_TOKEN_DURATION
- name: SMQ_AUTH_REFRESH_TOKEN_DURATION
value: {{ .Values.auth.refreshTokenDuration | quote }}
- name: MG_AUTH_INVITATION_DURATION
- name: SMQ_AUTH_INVITATION_DURATION
value: {{ .Values.auth.invitationDuration | quote }}
- name: MG_AUTH_DB_HOST
- name: SMQ_AUTH_DB_HOST
{{- if .Values.postgresqlauth.enabled }}
value: {{ .Release.Name }}-postgresqlauth
{{- else }}
value: {{ .Values.postgresqlauth.host | quote }}
{{- end }}
- name: MG_AUTH_DB_PORT
- name: SMQ_AUTH_DB_PORT
value: {{ .Values.postgresqlauth.port | quote }}
- name: MG_AUTH_DB_NAME
- name: SMQ_AUTH_DB_NAME
value: {{ .Values.postgresqlauth.database | quote }}
- name: MG_AUTH_DB_USER
- name: SMQ_AUTH_DB_USER
value: {{ .Values.postgresqlauth.username | quote }}
- name: MG_AUTH_DB_PASS
- name: SMQ_AUTH_DB_PASS
value: {{ .Values.postgresqlauth.password | quote }}
- name: MG_SPICEDB_HOST
- name: SMQ_SPICEDB_HOST
value: {{ .Release.Name }}-spicedb-envoy
- name: MG_SPICEDB_PORT
- name: SMQ_SPICEDB_PORT
value: {{ .Values.spicedb.grpc.port | quote}}
- name: MG_SPICEDB_SCHEMA_FILE
- name: SMQ_SPICEDB_SCHEMA_FILE
value: /schema.zed
- name: MG_SPICEDB_PRE_SHARED_KEY
- name: SMQ_SPICEDB_PRE_SHARED_KEY
value: {{.Values.spicedb.grpc.presharedKey | quote }}
ports:
- containerPort: {{ .Values.auth.httpPort }}
Expand Down
42 changes: 21 additions & 21 deletions charts/magistrala/templates/certs-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,51 +32,51 @@ spec:
image: "{{ default (printf "%s/certs" .Values.defaults.image.rootRepository) .Values.certs.image.repository }}:{{ default .Values.defaults.image.tag .Values.certs.image.tag }}"
imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.certs.image.pullPolicy }}
env:
- name: MG_JAEGER_URL
- name: SMQ_JAEGER_URL
value: "http://{{ .Values.jaeger.fullnameOverride }}-collector:{{ .Values.jaeger.collector.service.otlp.http.port }}/v1/traces"
- name: MG_JAEGER_TRACE_RATIO
- name: SMQ_JAEGER_TRACE_RATIO
value: {{ default .Values.defaults.jaegerTraceRatio .Values.certs.jaegerTraceRatio | quote }}
- name: MG_SEND_TELEMETRY
- name: SMQ_SEND_TELEMETRY
value: {{ default .Values.defaults.sendTelemetry .Values.certs.sendTelemetry | quote }}
- name: MG_CERTS_LOG_LEVEL
- name: SMQ_CERTS_LOG_LEVEL
value: {{ default .Values.defaults.logLevel .Values.certs.logLevel | quote }}
- name: MG_CERTS_HTTP_HOST
- name: SMQ_CERTS_HTTP_HOST
value: "0.0.0.0"
- name: MG_CERTS_HTTP_PORT
- name: SMQ_CERTS_HTTP_PORT
value: {{ .Values.certs.httpPort | quote }}
- name: MG_AUTH_GRPC_URL
- name: SMQ_AUTH_GRPC_URL
value: {{ .Release.Name }}-envoy:{{ .Values.auth.grpcPort }}
- name: MG_THINGS_URL
- name: SMQ_THINGS_URL
value: http://{{ .Release.Name }}-clients:{{ .Values.clients.httpPort }}
- name: MG_CERTS_DB_HOST
- name: SMQ_CERTS_DB_HOST
{{- if .Values.postgresqlcerts.enabled }}
value: {{ .Release.Name }}-postgresqlcerts
{{- else }}
value: {{ .Values.postgresqlcerts.host | quote }}
{{- end }}
- name: MG_CERTS_DB_PORT
- name: SMQ_CERTS_DB_PORT
value: {{ .Values.postgresqlcerts.port | quote }}
- name: MG_CERTS_DB_NAME
- name: SMQ_CERTS_DB_NAME
value: {{ .Values.postgresqlcerts.database | quote }}
- name: MG_CERTS_DB_USER
- name: SMQ_CERTS_DB_USER
value: {{ .Values.postgresqlcerts.username | quote }}
- name: MG_CERTS_DB_PASS
- name: SMQ_CERTS_DB_PASS
value: {{ .Values.postgresqlcerts.password | quote }}
- name: MG_CERTS_SIGN_CA_PATH
- name: SMQ_CERTS_SIGN_CA_PATH
value: {{ .Values.certs.signCAPath }}
- name: MG_CERTS_SIGN_CA_KEY_PATH
- name: SMQ_CERTS_SIGN_CA_KEY_PATH
value: {{ .Values.certs.signCAKeyPath }}
- name: MG_CERTS_VAULT_HOST
- name: SMQ_CERTS_VAULT_HOST
value: {{ .Values.certs.vault.url | quote }}
- name: MG_CERTS_VAULT_APPROLE_ROLEID
- name: SMQ_CERTS_VAULT_APPROLE_ROLEID
value: {{ .Values.certs.vault.approleRoleid | quote }}
- name: MG_CERTS_VAULT_APPROLE_SECRET
- name: SMQ_CERTS_VAULT_APPROLE_SECRET
value: {{ .Values.certs.vault.approleSecret | quote }}
- name: MG_CERTS_VAULT_NAMESPACE
- name: SMQ_CERTS_VAULT_NAMESPACE
value: {{ .Values.certs.vault.namespace | quote }}
- name: MG_CERTS_VAULT_THINGS_CERTS_PKI_PATH
- name: SMQ_CERTS_VAULT_THINGS_CERTS_PKI_PATH
value: {{ .Values.certs.vault.clientsCertsPkiPath | quote }}
- name: MG_CERTS_VAULT_THINGS_CERTS_PKI_ROLE_NAME
- name: SMQ_CERTS_VAULT_THINGS_CERTS_PKI_ROLE_NAME
value: {{ .Values.certs.vault.clientsCertsPkiRoleName | quote }}
ports:
- containerPort: {{ .Values.certs.httpPort }}
Expand Down
30 changes: 15 additions & 15 deletions charts/magistrala/templates/invitations-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,39 +31,39 @@ spec:
image: "{{ default (printf "%s/invitations" .Values.defaults.image.rootRepository) .Values.invitations.image.repository }}:{{ default .Values.defaults.image.tag .Values.invitations.image.tag }}"
imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.invitations.image.pullPolicy }}
env:
- name: MG_JAEGER_URL
- name: SMQ_JAEGER_URL
value: "http://{{ .Values.jaeger.fullnameOverride }}-collector:{{ .Values.jaeger.collector.service.otlp.http.port }}/v1/traces"
- name: MG_JAEGER_TRACE_RATIO
- name: SMQ_JAEGER_TRACE_RATIO
value: {{ default .Values.defaults.jaegerTraceRatio .Values.invitations.jaegerTraceRatio | quote }}
- name: MG_SEND_TELEMETRY
- name: SMQ_SEND_TELEMETRY
value: {{ default .Values.defaults.sendTelemetry .Values.invitations.sendTelemetry | quote }}
- name: MG_ES_URL
- name: SMQ_ES_URL
value: {{ .Values.defaults.eventStreamURL | quote }}
- name: MG_INVITATIONS_LOG_LEVEL
- name: SMQ_INVITATIONS_LOG_LEVEL
value: {{ default .Values.defaults.logLevel .Values.invitations.logLevel | quote }}
- name: MG_INVITATIONS_HTTP_HOST
- name: SMQ_INVITATIONS_HTTP_HOST
value: "0.0.0.0"
- name: MG_INVITATIONS_HTTP_PORT
- name: SMQ_INVITATIONS_HTTP_PORT
value: {{ .Values.invitations.httpPort | quote }}
- name : MG_AUTH_GRPC_URL
- name : SMQ_AUTH_GRPC_URL
value: {{ .Release.Name }}-envoy:{{ .Values.auth.grpcPort }}
- name: MG_USERS_URL
- name: SMQ_USERS_URL
value: http://{{ .Release.Name }}-users:{{ .Values.users.httpPort }}
- name: MG_DOMAINS_URL
- name: SMQ_DOMAINS_URL
value: http://{{ .Release.Name }}-auth:{{ .Values.auth.httpPort }}
- name: MG_INVITATIONS_DB_HOST
- name: SMQ_INVITATIONS_DB_HOST
{{- if .Values.postgresqlinvitations.enabled }}
value: "{{ .Release.Name }}-postgresqlinvitations"
{{- else }}
value: {{ .Values.postgresqlinvitations.host | quote }}
{{- end }}
- name: MG_INVITATIONS_DB_PORT
- name: SMQ_INVITATIONS_DB_PORT
value: {{ .Values.postgresqlinvitations.port | quote }}
- name: MG_INVITATIONS_DB_NAME
- name: SMQ_INVITATIONS_DB_NAME
value: {{ .Values.postgresqlinvitations.database | quote }}
- name: MG_INVITATIONS_DB_USER
- name: SMQ_INVITATIONS_DB_USER
value: {{ .Values.postgresqlinvitations.username | quote }}
- name: MG_INVITATIONS_DB_PASS
- name: SMQ_INVITATIONS_DB_PASS
value: {{ .Values.postgresqlinvitations.password | quote }}
ports:
- containerPort: {{ .Values.invitations.httpPort }}
Expand Down
26 changes: 13 additions & 13 deletions charts/magistrala/templates/journal-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,35 +31,35 @@ spec:
image: "{{ default (printf "%s/journal" .Values.defaults.image.rootRepository) .Values.journal.image.repository }}:{{ default .Values.defaults.image.tag .Values.journal.image.tag }}"
imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.journal.image.pullPolicy }}
env:
- name: MG_JAEGER_URL
- name: SMQ_JAEGER_URL
value: "http://{{ .Values.jaeger.fullnameOverride }}-collector:{{ .Values.jaeger.collector.service.otlp.http.port }}/v1/traces"
- name: MG_JAEGER_TRACE_RATIO
- name: SMQ_JAEGER_TRACE_RATIO
value: {{ default .Values.defaults.jaegerTraceRatio .Values.journal.jaegerTraceRatio | quote }}
- name: MG_SEND_TELEMETRY
- name: SMQ_SEND_TELEMETRY
value: {{ default .Values.defaults.sendTelemetry .Values.journal.sendTelemetry | quote }}
- name: MG_ES_URL
- name: SMQ_ES_URL
value: {{ .Values.defaults.eventStreamURL | quote }}
- name: MG_JOURNAL_LOG_LEVEL
- name: SMQ_JOURNAL_LOG_LEVEL
value: {{ default .Values.defaults.logLevel .Values.journal.logLevel | quote }}
- name: MG_JOURNAL_HTTP_HOST
- name: SMQ_JOURNAL_HTTP_HOST
value: "0.0.0.0"
- name: MG_JOURNAL_HTTP_PORT
- name: SMQ_JOURNAL_HTTP_PORT
value: {{ .Values.journal.httpPort | quote }}
- name : MG_AUTH_GRPC_URL
- name : SMQ_AUTH_GRPC_URL
value: {{ .Release.Name }}-envoy:{{ .Values.auth.grpcPort }}
- name: MG_JOURNAL_DB_HOST
- name: SMQ_JOURNAL_DB_HOST
{{- if .Values.postgresqljournal.enabled }}
value: "{{ .Release.Name }}-postgresqljournal"
{{- else }}
value: {{ .Values.postgresqljournal.host | quote }}
{{- end }}
- name: MG_JOURNAL_DB_PORT
- name: SMQ_JOURNAL_DB_PORT
value: {{ .Values.postgresqljournal.port | quote }}
- name: MG_JOURNAL_DB_NAME
- name: SMQ_JOURNAL_DB_NAME
value: {{ .Values.postgresqljournal.database | quote }}
- name: MG_JOURNAL_DB_USER
- name: SMQ_JOURNAL_DB_USER
value: {{ .Values.postgresqljournal.username | quote }}
- name: MG_JOURNAL_DB_PASS
- name: SMQ_JOURNAL_DB_PASS
value: {{ .Values.postgresqljournal.password | quote }}
ports:
- containerPort: {{ .Values.journal.httpPort }}
Expand Down
Loading

0 comments on commit 7e7c727

Please sign in to comment.