diff --git a/release-charts/mixingx-edge-unit/templates/_helpers.tpl b/release-charts/mixingx-edge-unit/templates/_helpers.tpl index fe5c2e8..e8ad2cf 100644 --- a/release-charts/mixingx-edge-unit/templates/_helpers.tpl +++ b/release-charts/mixingx-edge-unit/templates/_helpers.tpl @@ -10,6 +10,35 @@ {{- .Values.serviceId | default (include "mixingx-unit.name" .) -}} {{- end -}} +{{- define "mixingx-unit.configData" -}} +{{- $name := include "mixingx-unit.name" . -}} +{{- $serviceId := include "mixingx-unit.serviceId" . -}} +{{- $brokerSvcName := include "mixingx-unit.mqttBrokerServiceName" . -}} +HTTP_PORTS: "{{ .Values.ports.backend }}" +REDIS_HOST: "{{ .Values.sharedInfra.redis.host }}" +REDIS_PORT: "{{ .Values.sharedInfra.redis.port }}" +MESSAGING_HOST: "{{ .Values.sharedInfra.rabbitmq.host }}" +MESSAGING_PORT: "{{ .Values.sharedInfra.rabbitmq.port }}" +MESSAGING_USERNAME: "{{ .Values.sharedInfra.rabbitmq.username }}" +services__gateway__http__0: "http://gateway-service:8080" +EDGE_SERVICE_ID: "{{ $serviceId }}" +OTEL_EXPORTER_OTLP_ENDPOINT: "{{ .Values.sharedInfra.otlp.endpoint }}" +OTEL_EXPORTER_OTLP_PROTOCOL: "{{ .Values.sharedInfra.otlp.protocol }}" +OTEL_SERVICE_NAME: "{{ $name }}" +ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true" +{{- if .Values.mqtt.enabled }} +Mqtt__BrokerHost: "{{ $brokerSvcName }}" +Mqtt__BrokerPort: "{{ .Values.mqtt.port }}" +Mqtt__Enabled: "true" +{{- end }} +{{- if .Values.audit.publisher.enabled }} +AuditMqttPublisher__BrokerUrl: "{{ .Values.audit.publisher.brokerUrl }}" +AuditMqttPublisher__Service: "{{ .Values.audit.publisher.service | default "edge" }}" +AuditMqttPublisher__InstanceId: "{{ .Values.audit.publisher.instanceId | default $name }}" +AuditMqttPublisher__NodeId: "{{ .Values.audit.publisher.nodeId | default $name }}" +{{- end }} +{{- end -}} + {{- define "mixingx-unit.basePath" -}} {{- printf "/%s-%s" .Values.role (.Values.site | toString) -}} {{- end -}} diff --git a/release-charts/mixingx-edge-unit/templates/unit.yaml b/release-charts/mixingx-edge-unit/templates/unit.yaml index fe3e1b9..9535d31 100644 --- a/release-charts/mixingx-edge-unit/templates/unit.yaml +++ b/release-charts/mixingx-edge-unit/templates/unit.yaml @@ -40,6 +40,8 @@ spec: app.kubernetes.io/component: {{ $name }} template: metadata: + annotations: + checksum/config: {{ include "mixingx-unit.configData" . | sha256sum }} labels: app.kubernetes.io/component: {{ $name }} spec: @@ -131,29 +133,7 @@ kind: ConfigMap metadata: name: {{ $name }}-config data: - HTTP_PORTS: "{{ .Values.ports.backend }}" - REDIS_HOST: "{{ .Values.sharedInfra.redis.host }}" - REDIS_PORT: "{{ .Values.sharedInfra.redis.port }}" - MESSAGING_HOST: "{{ .Values.sharedInfra.rabbitmq.host }}" - MESSAGING_PORT: "{{ .Values.sharedInfra.rabbitmq.port }}" - MESSAGING_USERNAME: "{{ .Values.sharedInfra.rabbitmq.username }}" - services__gateway__http__0: "http://gateway-service:8080" - EDGE_SERVICE_ID: "{{ $serviceId }}" - OTEL_EXPORTER_OTLP_ENDPOINT: "{{ .Values.sharedInfra.otlp.endpoint }}" - OTEL_EXPORTER_OTLP_PROTOCOL: "{{ .Values.sharedInfra.otlp.protocol }}" - OTEL_SERVICE_NAME: "{{ $name }}" - ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true" - {{- if .Values.mqtt.enabled }} - Mqtt__BrokerHost: "{{ $brokerSvcName }}" - Mqtt__BrokerPort: "{{ .Values.mqtt.port }}" - Mqtt__Enabled: "true" - {{- end }} - {{- if .Values.audit.publisher.enabled }} - AuditMqttPublisher__BrokerUrl: "{{ .Values.audit.publisher.brokerUrl }}" - AuditMqttPublisher__Service: "{{ .Values.audit.publisher.service | default "edge" }}" - AuditMqttPublisher__InstanceId: "{{ .Values.audit.publisher.instanceId | default $name }}" - AuditMqttPublisher__NodeId: "{{ .Values.audit.publisher.nodeId | default $name }}" - {{- end }} +{{- include "mixingx-unit.configData" . | nindent 2 }} --- apiVersion: v1 kind: Secret diff --git a/release-charts/mixingx-sso/templates/_helpers.tpl b/release-charts/mixingx-sso/templates/_helpers.tpl index 635b7be..28f7335 100644 --- a/release-charts/mixingx-sso/templates/_helpers.tpl +++ b/release-charts/mixingx-sso/templates/_helpers.tpl @@ -2,6 +2,35 @@ {{- .Values.storage.className | default "local-path" -}} {{- end -}} +{{- define "mixingx-sso.configData" -}} +{{- $root := . -}} +{{- $name := $root.Values.sso.name -}} +{{- $role := $root.Values.sso.role -}} +{{- $serviceId := $root.Values.sso.serviceId -}} +{{- $pgHost := printf "%s-postgres-service" $name -}} +{{- $backendPort := $root.Values.sso.port | default 8080 -}} +HTTP_PORTS: "{{ $backendPort }}" +REDIS_HOST: "{{ $root.Values.sharedInfra.redis.host }}" +REDIS_PORT: "{{ $root.Values.sharedInfra.redis.port }}" +POSTGRESQL_HOST: "{{ $pgHost }}" +POSTGRESQL_PORT: "{{ $root.Values.sharedInfra.postgres.port }}" +POSTGRESQL_USERNAME: "{{ $root.Values.sharedInfra.postgres.username }}" +MESSAGING_HOST: "{{ $root.Values.sharedInfra.rabbitmq.host }}" +MESSAGING_PORT: "{{ $root.Values.sharedInfra.rabbitmq.port }}" +MESSAGING_USERNAME: "{{ $root.Values.sharedInfra.rabbitmq.username }}" +services__gateway__http__0: "http://gateway-service:8080" +{{ upper $role }}_SERVICE_ID: "{{ $serviceId }}" +{{- if $root.Values.audit.publisher.enabled }} +AuditMqttPublisher__BrokerUrl: "{{ $root.Values.audit.publisher.brokerUrl }}" +AuditMqttPublisher__Service: "{{ $root.Values.audit.publisher.service | default "sso" }}" +AuditMqttPublisher__InstanceId: "{{ $root.Values.audit.publisher.instanceId | default "sso" }}" +{{- end }} +OTEL_EXPORTER_OTLP_ENDPOINT: "{{ $root.Values.sharedInfra.otlp.endpoint }}" +OTEL_EXPORTER_OTLP_PROTOCOL: "{{ $root.Values.sharedInfra.otlp.protocol }}" +OTEL_SERVICE_NAME: "{{ $name }}" +ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true" +{{- end -}} + {{- define "mixingx-sso.tierAffinity" -}} {{- $root := .root -}} {{- $role := .role -}} diff --git a/release-charts/mixingx-sso/templates/sso.yaml b/release-charts/mixingx-sso/templates/sso.yaml index aae2857..bae2f0e 100644 --- a/release-charts/mixingx-sso/templates/sso.yaml +++ b/release-charts/mixingx-sso/templates/sso.yaml @@ -22,6 +22,8 @@ spec: app.kubernetes.io/component: {{ $name }} template: metadata: + annotations: + checksum/config: {{ include "mixingx-sso.configData" . | sha256sum }} labels: app.kubernetes.io/component: {{ $name }} spec: @@ -84,26 +86,7 @@ kind: ConfigMap metadata: name: {{ $name }}-config data: - HTTP_PORTS: "{{ $backendPort }}" - REDIS_HOST: "{{ $root.Values.sharedInfra.redis.host }}" - REDIS_PORT: "{{ $root.Values.sharedInfra.redis.port }}" - POSTGRESQL_HOST: "{{ $pgHost }}" - POSTGRESQL_PORT: "{{ $root.Values.sharedInfra.postgres.port }}" - POSTGRESQL_USERNAME: "{{ $root.Values.sharedInfra.postgres.username }}" - MESSAGING_HOST: "{{ $root.Values.sharedInfra.rabbitmq.host }}" - MESSAGING_PORT: "{{ $root.Values.sharedInfra.rabbitmq.port }}" - MESSAGING_USERNAME: "{{ $root.Values.sharedInfra.rabbitmq.username }}" - services__gateway__http__0: "http://gateway-service:8080" - {{ upper $role }}_SERVICE_ID: "{{ $serviceId }}" - {{- if .Values.audit.publisher.enabled }} - AuditMqttPublisher__BrokerUrl: "{{ .Values.audit.publisher.brokerUrl }}" - AuditMqttPublisher__Service: "{{ .Values.audit.publisher.service | default "sso" }}" - AuditMqttPublisher__InstanceId: "{{ .Values.audit.publisher.instanceId | default "sso" }}" - {{- end }} - OTEL_EXPORTER_OTLP_ENDPOINT: "{{ $root.Values.sharedInfra.otlp.endpoint }}" - OTEL_EXPORTER_OTLP_PROTOCOL: "{{ $root.Values.sharedInfra.otlp.protocol }}" - OTEL_SERVICE_NAME: "{{ $name }}" - ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true" +{{- include "mixingx-sso.configData" . | nindent 2 }} --- apiVersion: v1 kind: Secret diff --git a/release-charts/mixingx-ultra/templates/_helpers.tpl b/release-charts/mixingx-ultra/templates/_helpers.tpl index c47addf..6dd234b 100644 --- a/release-charts/mixingx-ultra/templates/_helpers.tpl +++ b/release-charts/mixingx-ultra/templates/_helpers.tpl @@ -2,6 +2,35 @@ {{- .Values.storage.className | default "local-path" -}} {{- end -}} +{{- define "mixingx-ultra.configData" -}} +{{- $root := . -}} +{{- $cfg := $root.Values.ultra -}} +{{- $name := $cfg.name -}} +{{- $role := $cfg.role -}} +{{- $serviceId := $cfg.serviceId -}} +{{- $pgHost := printf "%s-postgres-service" $name -}} +HTTP_PORTS: "8080" +REDIS_HOST: "{{ $root.Values.sharedInfra.redis.host }}" +REDIS_PORT: "{{ $root.Values.sharedInfra.redis.port }}" +POSTGRESQL_HOST: "{{ $pgHost }}" +POSTGRESQL_PORT: "{{ $root.Values.sharedInfra.postgres.port }}" +POSTGRESQL_USERNAME: "{{ $root.Values.sharedInfra.postgres.username }}" +MESSAGING_HOST: "{{ $root.Values.sharedInfra.rabbitmq.host }}" +MESSAGING_PORT: "{{ $root.Values.sharedInfra.rabbitmq.port }}" +MESSAGING_USERNAME: "{{ $root.Values.sharedInfra.rabbitmq.username }}" +services__gateway__http__0: "http://gateway-service:8080" +{{ upper $role }}_SERVICE_ID: "{{ $serviceId }}" +{{- if $root.Values.audit.publisher.enabled }} +AuditMqttPublisher__BrokerUrl: "{{ $root.Values.audit.publisher.brokerUrl }}" +AuditMqttPublisher__Service: "{{ $root.Values.audit.publisher.service | default "ultra" }}" +AuditMqttPublisher__InstanceId: "{{ $root.Values.audit.publisher.instanceId | default "ultra" }}" +{{- end }} +OTEL_EXPORTER_OTLP_ENDPOINT: "{{ $root.Values.sharedInfra.otlp.endpoint }}" +OTEL_EXPORTER_OTLP_PROTOCOL: "{{ $root.Values.sharedInfra.otlp.protocol }}" +OTEL_SERVICE_NAME: "{{ $name }}" +ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true" +{{- end -}} + {{- define "mixingx-ultra.tierAffinity" -}} {{- $root := .root -}} {{- $role := .role -}} diff --git a/release-charts/mixingx-ultra/templates/ultra.yaml b/release-charts/mixingx-ultra/templates/ultra.yaml index 56d9c8c..f856d59 100644 --- a/release-charts/mixingx-ultra/templates/ultra.yaml +++ b/release-charts/mixingx-ultra/templates/ultra.yaml @@ -27,6 +27,8 @@ spec: app.kubernetes.io/component: {{ $name }} template: metadata: + annotations: + checksum/config: {{ include "mixingx-ultra.configData" . | sha256sum }} labels: app.kubernetes.io/component: {{ $name }} spec: @@ -89,26 +91,7 @@ kind: ConfigMap metadata: name: {{ $name }}-config data: - HTTP_PORTS: "{{ $port }}" - REDIS_HOST: "{{ $root.Values.sharedInfra.redis.host }}" - REDIS_PORT: "{{ $root.Values.sharedInfra.redis.port }}" - POSTGRESQL_HOST: "{{ $pgHost }}" - POSTGRESQL_PORT: "{{ $root.Values.sharedInfra.postgres.port }}" - POSTGRESQL_USERNAME: "{{ $root.Values.sharedInfra.postgres.username }}" - MESSAGING_HOST: "{{ $root.Values.sharedInfra.rabbitmq.host }}" - MESSAGING_PORT: "{{ $root.Values.sharedInfra.rabbitmq.port }}" - MESSAGING_USERNAME: "{{ $root.Values.sharedInfra.rabbitmq.username }}" - services__gateway__http__0: "http://gateway-service:8080" - {{ upper $role }}_SERVICE_ID: "{{ $serviceId }}" - {{- if .Values.audit.publisher.enabled }} - AuditMqttPublisher__BrokerUrl: "{{ .Values.audit.publisher.brokerUrl }}" - AuditMqttPublisher__Service: "{{ .Values.audit.publisher.service | default "ultra" }}" - AuditMqttPublisher__InstanceId: "{{ .Values.audit.publisher.instanceId | default "ultra" }}" - {{- end }} - OTEL_EXPORTER_OTLP_ENDPOINT: "{{ $root.Values.sharedInfra.otlp.endpoint }}" - OTEL_EXPORTER_OTLP_PROTOCOL: "{{ $root.Values.sharedInfra.otlp.protocol }}" - OTEL_SERVICE_NAME: "{{ $name }}" - ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true" +{{- include "mixingx-ultra.configData" . | nindent 2 }} --- apiVersion: v1 kind: Secret