Merge remote-tracking branch 'origin/develop/v.1.0.1'
This commit is contained in:
commit
76ddfb4e3f
3 files changed
+33
-18
No files matched your search
@@ -49,3 +49,28 @@ affinity:
|
|||||||
topologyKey: kubernetes.io/hostname
|
topologyKey: kubernetes.io/hostname
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
||||||
|
{{- define "mixingx-unit.backendConfigData" -}}
|
||||||
|
{{- $name := include "mixingx-unit.name" . -}}
|
||||||
|
{{- $serviceId := include "mixingx-unit.serviceId" . -}}
|
||||||
|
{{- $pgHost := printf "%s-postgres-service" $name -}}
|
||||||
|
HTTP_PORTS: "{{ .Values.ports.backend }}"
|
||||||
|
REDIS_HOST: "{{ .Values.sharedInfra.redis.host }}"
|
||||||
|
REDIS_PORT: "{{ .Values.sharedInfra.redis.port }}"
|
||||||
|
POSTGRESQL_HOST: "{{ $pgHost }}"
|
||||||
|
POSTGRESQL_PORT: "{{ .Values.sharedInfra.postgres.port }}"
|
||||||
|
POSTGRESQL_USERNAME: "{{ .Values.sharedInfra.postgres.username }}"
|
||||||
|
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"
|
||||||
|
services__ultra__http__0: "http://{{ .Values.sharedInfra.ultra.host }}:{{ .Values.sharedInfra.ultra.port }}"
|
||||||
|
AGENT_SERVICE_ID: "{{ $serviceId }}"
|
||||||
|
{{- if .Values.phaseType }}
|
||||||
|
AGENT_PHASE_TYPE: "{{ .Values.phaseType }}"
|
||||||
|
{{- end }}
|
||||||
|
OTEL_EXPORTER_OTLP_ENDPOINT: "{{ .Values.sharedInfra.otlp.endpoint }}"
|
||||||
|
OTEL_EXPORTER_OTLP_PROTOCOL: "{{ .Values.sharedInfra.otlp.protocol }}"
|
||||||
|
OTEL_SERVICE_NAME: "{{ $name }}"
|
||||||
|
ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true"
|
||||||
|
{{- end -}}
|
||||||
@@ -22,6 +22,8 @@ spec:
|
|||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/component: {{ $name }}
|
app.kubernetes.io/component: {{ $name }}
|
||||||
|
annotations:
|
||||||
|
checksum/config: {{ include "mixingx-unit.backendConfigData" . | sha256sum }}
|
||||||
spec:
|
spec:
|
||||||
{{ include "mixingx-unit.backendScheduling" . | nindent 6 }}
|
{{ include "mixingx-unit.backendScheduling" . | nindent 6 }}
|
||||||
containers:
|
containers:
|
||||||
@@ -86,24 +88,7 @@ kind: ConfigMap
|
|||||||
metadata:
|
metadata:
|
||||||
name: {{ $name }}-config
|
name: {{ $name }}-config
|
||||||
data:
|
data:
|
||||||
HTTP_PORTS: "{{ .Values.ports.backend }}"
|
{{- include "mixingx-unit.backendConfigData" . | nindent 2 }}
|
||||||
REDIS_HOST: "{{ .Values.sharedInfra.redis.host }}"
|
|
||||||
REDIS_PORT: "{{ .Values.sharedInfra.redis.port }}"
|
|
||||||
POSTGRESQL_HOST: "{{ $pgHost }}"
|
|
||||||
POSTGRESQL_PORT: "{{ .Values.sharedInfra.postgres.port }}"
|
|
||||||
POSTGRESQL_USERNAME: "{{ .Values.sharedInfra.postgres.username }}"
|
|
||||||
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"
|
|
||||||
AGENT_SERVICE_ID: "{{ $serviceId }}"
|
|
||||||
{{- if .Values.phaseType }}
|
|
||||||
AGENT_PHASE_TYPE: "{{ .Values.phaseType }}"
|
|
||||||
{{- end }}
|
|
||||||
OTEL_EXPORTER_OTLP_ENDPOINT: "{{ .Values.sharedInfra.otlp.endpoint }}"
|
|
||||||
OTEL_EXPORTER_OTLP_PROTOCOL: "{{ .Values.sharedInfra.otlp.protocol }}"
|
|
||||||
OTEL_SERVICE_NAME: "{{ $name }}"
|
|
||||||
ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true"
|
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Secret
|
kind: Secret
|
||||||
|
|||||||
@@ -36,6 +36,11 @@ nodeName: ""
|
|||||||
nodeSelector: {}
|
nodeSelector: {}
|
||||||
|
|
||||||
sharedInfra:
|
sharedInfra:
|
||||||
|
# Agent 侧服务发现注入的 Ultra 地址(services__ultra__http__0)。
|
||||||
|
# 默认指向平台级 Ultra;未来多 Ultra 部署时在对应 agent 的 values 覆盖 host 即可。
|
||||||
|
ultra:
|
||||||
|
host: ultra-service
|
||||||
|
port: 8080
|
||||||
postgres:
|
postgres:
|
||||||
username: postgres
|
username: postgres
|
||||||
password: "Admin12345"
|
password: "Admin12345"
|
||||||
|
|||||||
Reference in new issue
Block a user