Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d7366869ed |
No files matched your search
@@ -27,14 +27,32 @@
|
||||
CI 只对 `release-charts/` 做 lint/template(见 hub `.drone.yml`):
|
||||
|
||||
```bash
|
||||
helm lint release-charts/mixingx-edge-unit
|
||||
helm template ci-edge release-charts/mixingx-edge-unit
|
||||
helm lint release-charts/mixingx-edge-unit \
|
||||
--set global.imageRegistry=registry.invalid/mixingx \
|
||||
--set images.edge.tag=ci \
|
||||
--set images.edgeWeb.tag=ci
|
||||
helm template ci-edge release-charts/mixingx-edge-unit \
|
||||
--set global.imageRegistry=registry.invalid/mixingx \
|
||||
--set images.edge.tag=ci \
|
||||
--set images.edgeWeb.tag=ci
|
||||
```
|
||||
|
||||
### ArgoCD 部署
|
||||
|
||||
`mixingx-deploy` 的 ApplicationSet 按 unit chart 逐个发布,每个 edge/agent 一个独立 Helm release。详见 `mixingx-deploy/`。
|
||||
|
||||
## 镜像地址约定
|
||||
|
||||
所有部署到 K3s 的运行镜像统一按下面的结构拼接:
|
||||
|
||||
```text
|
||||
<global.imageRegistry>/<images.*.repository>:<images.*.tag>
|
||||
```
|
||||
|
||||
`global.imageRegistry` 必须由 `mixingx-deploy` 的环境 values 提供,Chart 不保存 AL ACR、Harbor、内网 IP 或公网镜像仓库地址。业务镜像和 PostgreSQL、Redis、RabbitMQ、MongoDB、NanoMQ 等基础镜像遵守同一规则。
|
||||
|
||||
生产环境必须传入明确且不可变的 tag,不使用 `latest`。AL ACR 与现场 Harbor 必须保持相同的 repository/tag,只切换 `global.imageRegistry`。
|
||||
|
||||
## 关联文档
|
||||
|
||||
- hub [AGENTS.md](https://gitee.com/mixing-tech/mixingx.hub) — 全项目指南
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
# 交付镜像清单(Delivery Image Manifest)— ADR-0066
|
||||
#
|
||||
# 用途:release 前核对 ACR 上第三方镜像齐备(发布流水线 Step 2 读取,缺失即 fail fast)。
|
||||
# 规则:
|
||||
# - acr 路径统一收进 library/*(显式引用不依赖上游路径对齐)
|
||||
# - pushed: false = 尚未推到 ACR 的缺口,release 前必须补推(cr_temp_user 临时 token 手工作业)
|
||||
# - optional: true = 客户默认不部署,缺了不阻塞
|
||||
#
|
||||
# 业务镜像(mixingx/*)不在本清单:它们由发布流水线从交付基线 retag 产出,天然齐备。
|
||||
|
||||
thirdParty:
|
||||
# ── 平台核心依赖(缺一不可) ──
|
||||
- { upstream: docker.io/library/postgres:17, acr: library/postgres:17, pushed: true }
|
||||
- { upstream: docker.io/library/redis:8.6, acr: library/redis:8.6, pushed: true }
|
||||
- { upstream: docker.io/library/rabbitmq:4.3-management, acr: library/rabbitmq:4.3-management, pushed: true }
|
||||
# ── edge 单元 + audit broker 硬依赖 ──
|
||||
- { upstream: docker.io/emqx/nanomq:0.25.2-2, acr: library/nanomq:0.25.2-2, pushed: true } # D2 已补推(2026-08-22)
|
||||
# ── 工具类(现场无组件直接依赖,备查;tag 以 ACR 实存为准,2026-08-22 盘点) ──
|
||||
- { upstream: docker.io/library/busybox:1.36, acr: library/busybox:1.36, pushed: true, optional: true }
|
||||
- { upstream: docker.io/library/alpine:3.19, acr: library/alpine:3.19, pushed: true, optional: true }
|
||||
# ── 可选(客户默认不部署) ──
|
||||
- { upstream: docker.io/emqx/mqttx-web:latest, acr: library/mqttx-web:latest, pushed: true, optional: true } # mxlexus 已部署(2026-08-22)
|
||||
- { upstream: docker.io/library/mongo:7.0, acr: library/mongo:7.0, pushed: true, optional: true } # v2 audit 已去 mongo,存量备用
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-agent-unit
|
||||
description: "One MixingX agent unit release: agent backend, agent web, and agent PostgreSQL."
|
||||
type: application
|
||||
version: 1.0.9
|
||||
appVersion: "1.0.9"
|
||||
version: 0.1.1
|
||||
appVersion: "1.0.1"
|
||||
@@ -6,11 +6,12 @@ Deploys one agent site as one Helm release:
|
||||
- `agent-web-<site>` frontend
|
||||
- `agent-<site>-postgres` StatefulSet and retained PVC
|
||||
|
||||
Agent PostgreSQL sessions set `idle_in_transaction_session_timeout` through the
|
||||
connection string. The default is `60s`, configurable with
|
||||
`sharedInfra.postgres.idleInTransactionSessionTimeout`. This is a database-side
|
||||
safety net for leaked idle transactions and does not change database users,
|
||||
passwords, roles, or the PostgreSQL StatefulSet credential model.
|
||||
The release requires a pre-created PostgreSQL credentials Secret. By default its
|
||||
name is `agent-<site>-postgres-credentials`; the required keys are
|
||||
`admin-password`, `app-password`, and `connection-string`. The Agent connection
|
||||
string must use `sharedInfra.postgres.appUsername`, while the init container uses
|
||||
the administrator credential only to idempotently provision the non-superuser
|
||||
application role and its database-local idle transaction timeout.
|
||||
|
||||
Example:
|
||||
|
||||
@@ -20,5 +21,6 @@ helm upgrade --install mixingx-agent-workshop-a ./charts/mixingx-agent-unit \
|
||||
--set site=workshop-a \
|
||||
--set nodeName=agent-node-01 \
|
||||
--set storage.className=longhorn \
|
||||
--set sharedInfra.postgres.appUsername=agent_workshop_a \
|
||||
--set tag=2026.07.02-abc1234
|
||||
```
|
||||
@@ -0,0 +1,99 @@
|
||||
\set ON_ERROR_STOP on
|
||||
\getenv agent_username AGENT_DB_USERNAME
|
||||
\getenv agent_password AGENT_DB_PASSWORD
|
||||
\getenv database_name POSTGRESQL_DATABASENAME
|
||||
\getenv idle_timeout IDLE_IN_TRANSACTION_SESSION_TIMEOUT
|
||||
|
||||
SELECT format(
|
||||
'CREATE ROLE %I LOGIN PASSWORD %L NOSUPERUSER NOCREATEDB NOCREATEROLE NOREPLICATION NOBYPASSRLS',
|
||||
:'agent_username',
|
||||
:'agent_password')
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM pg_roles
|
||||
WHERE rolname = :'agent_username')
|
||||
\gexec
|
||||
|
||||
SELECT format(
|
||||
'ALTER ROLE %I WITH LOGIN PASSWORD %L NOSUPERUSER NOCREATEDB NOCREATEROLE NOREPLICATION NOBYPASSRLS',
|
||||
:'agent_username',
|
||||
:'agent_password')
|
||||
\gexec
|
||||
|
||||
SELECT format('GRANT CONNECT ON DATABASE %I TO %I', :'database_name', :'agent_username')
|
||||
\gexec
|
||||
|
||||
SELECT format('ALTER DATABASE %I OWNER TO %I', :'database_name', :'agent_username')
|
||||
\gexec
|
||||
|
||||
SELECT format('ALTER SCHEMA public OWNER TO %I', :'agent_username')
|
||||
\gexec
|
||||
|
||||
SELECT format('GRANT ALL ON SCHEMA public TO %I', :'agent_username')
|
||||
\gexec
|
||||
|
||||
-- Existing installations may have objects created by the former postgres application login.
|
||||
-- Transfer only user objects in public; extension-owned objects remain with their extension owner.
|
||||
SELECT format(
|
||||
'ALTER %s %I.%I OWNER TO %I',
|
||||
CASE c.relkind
|
||||
WHEN 'r' THEN 'TABLE'
|
||||
WHEN 'p' THEN 'TABLE'
|
||||
WHEN 'S' THEN 'SEQUENCE'
|
||||
WHEN 'v' THEN 'VIEW'
|
||||
WHEN 'm' THEN 'MATERIALIZED VIEW'
|
||||
WHEN 'f' THEN 'FOREIGN TABLE'
|
||||
END,
|
||||
n.nspname,
|
||||
c.relname,
|
||||
:'agent_username')
|
||||
FROM pg_class c
|
||||
JOIN pg_namespace n ON n.oid = c.relnamespace
|
||||
WHERE n.nspname = 'public'
|
||||
AND c.relkind IN ('r', 'p', 'S', 'v', 'm', 'f')
|
||||
AND pg_get_userbyid(c.relowner) <> :'agent_username'
|
||||
AND NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM pg_depend d
|
||||
WHERE d.classid = 'pg_class'::regclass
|
||||
AND d.objid = c.oid
|
||||
AND d.deptype = 'e')
|
||||
\gexec
|
||||
|
||||
SELECT format(
|
||||
'ALTER %s %I.%I(%s) OWNER TO %I',
|
||||
CASE p.prokind
|
||||
WHEN 'p' THEN 'PROCEDURE'
|
||||
ELSE 'FUNCTION'
|
||||
END,
|
||||
n.nspname,
|
||||
p.proname,
|
||||
pg_get_function_identity_arguments(p.oid),
|
||||
:'agent_username')
|
||||
FROM pg_proc p
|
||||
JOIN pg_namespace n ON n.oid = p.pronamespace
|
||||
WHERE n.nspname = 'public'
|
||||
AND p.prokind IN ('f', 'p', 'w')
|
||||
AND pg_get_userbyid(p.proowner) <> :'agent_username'
|
||||
AND NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM pg_depend d
|
||||
WHERE d.classid = 'pg_proc'::regclass
|
||||
AND d.objid = p.oid
|
||||
AND d.deptype = 'e')
|
||||
\gexec
|
||||
|
||||
SELECT format(
|
||||
'ALTER ROLE %I IN DATABASE %I SET idle_in_transaction_session_timeout TO %L',
|
||||
:'agent_username',
|
||||
:'database_name',
|
||||
:'idle_timeout')
|
||||
\gexec
|
||||
|
||||
-- Startup migrations run as the database owner. Keep active migration and maintenance work
|
||||
-- unbounded here; only idle transactions receive the safety timeout.
|
||||
SELECT format('ALTER ROLE %I IN DATABASE %I RESET statement_timeout', :'agent_username', :'database_name')
|
||||
\gexec
|
||||
|
||||
SELECT format('ALTER ROLE %I IN DATABASE %I RESET lock_timeout', :'agent_username', :'database_name')
|
||||
\gexec
|
||||
@@ -14,10 +14,21 @@
|
||||
{{- .Values.serviceId | default (include "mixingx-unit.name" .) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-unit.postgresCredentialsSecretName" -}}
|
||||
{{- .Values.sharedInfra.postgres.credentialsSecret.name | default (printf "%s-postgres-credentials" (include "mixingx-unit.name" .)) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-unit.basePath" -}}
|
||||
{{- printf "/%s-%s" .Values.role (.Values.site | toString) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-agent-unit.image" -}}
|
||||
{{- $registry := required "global.imageRegistry is required" .registry -}}
|
||||
{{- $repository := required "image.repository is required" .image.repository -}}
|
||||
{{- $tag := required "image.tag is required" .image.tag -}}
|
||||
{{- printf "%s/%s:%s" (trimSuffix "/" $registry) (trimPrefix "/" $repository) ($tag | toString) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-unit.storageClassName" -}}
|
||||
{{- .Values.storage.className | default "local-path" -}}
|
||||
{{- end -}}
|
||||
@@ -59,7 +70,8 @@ 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 }}"
|
||||
POSTGRESQL_USERNAME: "{{ .Values.sharedInfra.postgres.appUsername }}"
|
||||
POSTGRESQL_DATABASENAME: "{{ include "mixingx-unit.database" . }}"
|
||||
MESSAGING_HOST: "{{ .Values.sharedInfra.rabbitmq.host }}"
|
||||
MESSAGING_PORT: "{{ .Values.sharedInfra.rabbitmq.port }}"
|
||||
MESSAGING_USERNAME: "{{ .Values.sharedInfra.rabbitmq.username }}"
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
{{- $name := include "mixingx-unit.name" . -}}
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: {{ $name }}-postgres-role-provisioning
|
||||
labels:
|
||||
app.kubernetes.io/name: mixingx
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/component: {{ $name }}-postgres
|
||||
data:
|
||||
provision-agent-role.sql: |
|
||||
{{ .Files.Get "files/provision-agent-role.sql" | nindent 4 }}
|
||||
@@ -4,6 +4,7 @@
|
||||
{{- $serviceId := include "mixingx-unit.serviceId" . -}}
|
||||
{{- $basePath := include "mixingx-unit.basePath" . -}}
|
||||
{{- $pgHost := printf "%s-postgres-service" $name -}}
|
||||
{{- $pgCredentialsSecretName := include "mixingx-unit.postgresCredentialsSecretName" . -}}
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
@@ -24,19 +25,61 @@ spec:
|
||||
app.kubernetes.io/component: {{ $name }}
|
||||
annotations:
|
||||
checksum/config: {{ include "mixingx-unit.backendConfigData" . | sha256sum }}
|
||||
checksum/postgres-role-sql: {{ .Files.Get "files/provision-agent-role.sql" | sha256sum }}
|
||||
spec:
|
||||
{{ include "mixingx-unit.backendScheduling" . | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
initContainers:
|
||||
- name: provision-postgres-role
|
||||
image: {{ .Values.images.postgres.repository }}:{{ .Values.images.postgres.tag | default "latest" }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
command: ["/bin/sh", "-ec"]
|
||||
args:
|
||||
- |
|
||||
attempt=0
|
||||
until pg_isready --host="$POSTGRESQL_HOST" --port="$POSTGRESQL_PORT" --username="$POSTGRES_ADMIN_USERNAME" --dbname="$POSTGRESQL_DATABASENAME"; do
|
||||
attempt=$((attempt + 1))
|
||||
if [ "$attempt" -ge 60 ]; then
|
||||
echo "PostgreSQL did not become ready within 120 seconds" >&2
|
||||
exit 1
|
||||
fi
|
||||
sleep 2
|
||||
done
|
||||
exec psql \
|
||||
--host="$POSTGRESQL_HOST" \
|
||||
--port="$POSTGRESQL_PORT" \
|
||||
--username="$POSTGRES_ADMIN_USERNAME" \
|
||||
--dbname="$POSTGRESQL_DATABASENAME" \
|
||||
--file=/opt/mixingx/postgres/provision-agent-role.sql
|
||||
env:
|
||||
- name: POSTGRESQL_HOST
|
||||
value: "{{ $pgHost }}"
|
||||
- name: POSTGRESQL_PORT
|
||||
value: "{{ .Values.sharedInfra.postgres.port }}"
|
||||
- name: POSTGRESQL_DATABASENAME
|
||||
value: "{{ $database }}"
|
||||
- name: POSTGRES_ADMIN_USERNAME
|
||||
value: "{{ .Values.sharedInfra.postgres.adminUsername }}"
|
||||
- name: AGENT_DB_USERNAME
|
||||
value: "{{ .Values.sharedInfra.postgres.appUsername }}"
|
||||
- name: IDLE_IN_TRANSACTION_SESSION_TIMEOUT
|
||||
value: "{{ .Values.sharedInfra.postgres.idleInTransactionSessionTimeout }}"
|
||||
- name: PGPASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ $pgCredentialsSecretName }}
|
||||
key: {{ .Values.sharedInfra.postgres.credentialsSecret.adminPasswordKey }}
|
||||
- name: AGENT_DB_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ $pgCredentialsSecretName }}
|
||||
key: {{ .Values.sharedInfra.postgres.credentialsSecret.appPasswordKey }}
|
||||
volumeMounts:
|
||||
- name: postgres-role-provisioning
|
||||
mountPath: /opt/mixingx/postgres
|
||||
readOnly: true
|
||||
containers:
|
||||
- name: {{ $name }}
|
||||
{{ $backendImg := .Values.images.backend }}
|
||||
{{ $agentImg := .Values.images.agent | default dict }}
|
||||
{{ $backendRepo := $agentImg.repository | default $backendImg.repository }}
|
||||
{{ $backendTag := $agentImg.tag | default $backendImg.tag | default .Values.tag | default "latest" }}
|
||||
image: {{ .Values.registry }}/{{ $backendRepo }}:{{ $backendTag }}
|
||||
image: {{ include "mixingx-agent-unit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.agent) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- name: http
|
||||
@@ -50,6 +93,16 @@ spec:
|
||||
env:
|
||||
- name: TZ
|
||||
value: "{{ .Values.timezone | default "Asia/Shanghai" }}"
|
||||
- name: ConnectionStrings__PostgreSQL
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ $pgCredentialsSecretName }}
|
||||
key: {{ .Values.sharedInfra.postgres.credentialsSecret.connectionStringKey }}
|
||||
- name: POSTGRESQL_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ $pgCredentialsSecretName }}
|
||||
key: {{ .Values.sharedInfra.postgres.credentialsSecret.appPasswordKey }}
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /health
|
||||
@@ -66,6 +119,10 @@ spec:
|
||||
periodSeconds: 30
|
||||
timeoutSeconds: 10
|
||||
failureThreshold: 8
|
||||
volumes:
|
||||
- name: postgres-role-provisioning
|
||||
configMap:
|
||||
name: {{ $name }}-postgres-role-provisioning
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
@@ -103,10 +160,6 @@ stringData:
|
||||
ConnectionStrings__redis: "{{ .Values.sharedInfra.redis.host }}:{{ .Values.sharedInfra.redis.port }},password={{ .Values.sharedInfra.redis.password }}"
|
||||
REDIS_PASSWORD: "{{ .Values.sharedInfra.redis.password }}"
|
||||
REDIS_URI: "redis://:{{ .Values.sharedInfra.redis.password }}@{{ .Values.sharedInfra.redis.host }}:{{ .Values.sharedInfra.redis.port }}"
|
||||
ConnectionStrings__PostgreSQL: "Host={{ $pgHost }};Port={{ .Values.sharedInfra.postgres.port }};Username={{ .Values.sharedInfra.postgres.username }};Password={{ .Values.sharedInfra.postgres.password }};Database={{ $database }};Options=-c idle_in_transaction_session_timeout={{ .Values.sharedInfra.postgres.idleInTransactionSessionTimeout }}"
|
||||
POSTGRESQL_PASSWORD: "{{ .Values.sharedInfra.postgres.password }}"
|
||||
POSTGRESQL_URI: "postgresql://{{ .Values.sharedInfra.postgres.username }}:{{ .Values.sharedInfra.postgres.password }}@{{ $pgHost }}:{{ .Values.sharedInfra.postgres.port }}/{{ $database }}"
|
||||
POSTGRESQL_DATABASENAME: "{{ $database }}"
|
||||
ConnectionStrings__messaging: "amqp://{{ .Values.sharedInfra.rabbitmq.username }}:{{ .Values.sharedInfra.rabbitmq.password }}@{{ .Values.sharedInfra.rabbitmq.host }}:{{ .Values.sharedInfra.rabbitmq.port }}"
|
||||
MESSAGING_PASSWORD: "{{ .Values.sharedInfra.rabbitmq.password }}"
|
||||
MESSAGING_URI: "amqp://{{ .Values.sharedInfra.rabbitmq.username }}:{{ .Values.sharedInfra.rabbitmq.password }}@{{ .Values.sharedInfra.rabbitmq.host }}:{{ .Values.sharedInfra.rabbitmq.port }}"
|
||||
@@ -134,17 +187,9 @@ spec:
|
||||
app.kubernetes.io/component: {{ $webName }}
|
||||
spec:
|
||||
{{ include "mixingx-unit.followerScheduling" . | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: {{ $webName }}
|
||||
{{ $frontendImg := .Values.images.frontend }}
|
||||
{{ $agentWebImg := .Values.images.agentWeb | default dict }}
|
||||
{{ $frontendRepo := $agentWebImg.repository | default $frontendImg.repository }}
|
||||
{{ $frontendTag := $agentWebImg.tag | default $frontendImg.tag | default .Values.tag | default "latest" }}
|
||||
image: {{ .Values.registry }}/{{ $frontendRepo }}:{{ $frontendTag }}
|
||||
image: {{ include "mixingx-agent-unit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.agentWeb) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- name: http
|
||||
@@ -208,21 +253,20 @@ spec:
|
||||
app.kubernetes.io/component: {{ $name }}-postgres
|
||||
spec:
|
||||
{{ include "mixingx-unit.followerScheduling" . | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: postgres
|
||||
image: {{ .Values.images.postgres.repository }}:{{ .Values.images.postgres.tag | default "latest" }}
|
||||
image: {{ include "mixingx-agent-unit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.postgres) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
env:
|
||||
- name: POSTGRES_PASSWORD
|
||||
value: "{{ .Values.sharedInfra.postgres.password }}"
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ $pgCredentialsSecretName }}
|
||||
key: {{ .Values.sharedInfra.postgres.credentialsSecret.adminPasswordKey }}
|
||||
- name: POSTGRES_DB
|
||||
value: "{{ $database }}"
|
||||
- name: POSTGRES_USER
|
||||
value: "{{ .Values.sharedInfra.postgres.username }}"
|
||||
value: "{{ .Values.sharedInfra.postgres.adminUsername }}"
|
||||
- name: PGDATA
|
||||
value: /var/lib/postgresql/data/pgdata
|
||||
ports:
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
registry: 192.168.1.105:8888/mixingx
|
||||
tag: latest
|
||||
timezone: Asia/Shanghai
|
||||
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
|
||||
imagePullSecrets: []
|
||||
global:
|
||||
imageRegistry: ""
|
||||
|
||||
timezone: Asia/Shanghai
|
||||
|
||||
role: agent
|
||||
site: "0"
|
||||
@@ -13,17 +11,9 @@ phaseType: "" # 工序类型(对应 apphost 的 AGENT_PHASE_TYPE,如 DieC
|
||||
database: ""
|
||||
|
||||
images:
|
||||
backend:
|
||||
repository: agent
|
||||
tag: ""
|
||||
frontend:
|
||||
repository: agent-web
|
||||
tag: ""
|
||||
postgres:
|
||||
repository: docker.io/library/postgres
|
||||
tag: "17"
|
||||
agent: {}
|
||||
agentWeb: {}
|
||||
agent: { repository: agent, tag: "" }
|
||||
agentWeb: { repository: agent-web, tag: "" }
|
||||
postgres: { repository: postgres, tag: "17" }
|
||||
|
||||
ports:
|
||||
backend: 8080
|
||||
@@ -45,10 +35,16 @@ sharedInfra:
|
||||
host: ultra-service
|
||||
port: 8080
|
||||
postgres:
|
||||
username: postgres
|
||||
password: "Admin12345"
|
||||
adminUsername: postgres
|
||||
appUsername: agent_runtime
|
||||
port: 5432
|
||||
idleInTransactionSessionTimeout: 60s
|
||||
credentialsSecret:
|
||||
# Leave empty to use <role>-<site>-postgres-credentials.
|
||||
name: ""
|
||||
adminPasswordKey: admin-password
|
||||
appPasswordKey: app-password
|
||||
connectionStringKey: connection-string
|
||||
redis:
|
||||
host: redis-service
|
||||
port: 6379
|
||||
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-audit
|
||||
description: MixingX audit service.
|
||||
type: application
|
||||
version: 1.0.9
|
||||
appVersion: "1.0.9"
|
||||
version: 0.1.0
|
||||
appVersion: "1.0.1"
|
||||
@@ -2,6 +2,13 @@
|
||||
{{- .Values.storage.className | default "local-path" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-audit.image" -}}
|
||||
{{- $registry := required "global.imageRegistry is required" .registry -}}
|
||||
{{- $repository := required "image.repository is required" .image.repository -}}
|
||||
{{- $tag := required "image.tag is required" .image.tag -}}
|
||||
{{- printf "%s/%s:%s" (trimSuffix "/" $registry) (trimPrefix "/" $repository) ($tag | toString) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-audit.tierAffinity" -}}
|
||||
{{- $root := .root -}}
|
||||
{{- $role := .role -}}
|
||||
|
||||
@@ -32,13 +32,9 @@ spec:
|
||||
app.kubernetes.io/component: {{ .Values.audit.database }}-postgres
|
||||
spec:
|
||||
{{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: postgres
|
||||
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
||||
image: {{ include "mixingx-audit.image" (dict "registry" $root.Values.global.imageRegistry "image" $root.Values.images.postgres) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
env:
|
||||
- name: POSTGRES_PASSWORD
|
||||
|
||||
@@ -22,13 +22,9 @@ spec:
|
||||
app.kubernetes.io/component: audit-nanomq
|
||||
spec:
|
||||
{{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: nanomq
|
||||
image: {{ .Values.audit.mqtt.image | default "emqx/nanomq:0.25.2-2" }}
|
||||
image: {{ include "mixingx-audit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.nanomq) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
command: ["/bin/sh"]
|
||||
args:
|
||||
|
||||
@@ -20,13 +20,9 @@ spec:
|
||||
app.kubernetes.io/component: audit-web
|
||||
spec:
|
||||
{{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: audit-web
|
||||
image: "{{ .Values.registry }}/{{ .Values.images.auditWeb.repository | default "audit-web" }}:{{ .Values.images.auditWeb.tag | default .Values.tag | default "latest" }}"
|
||||
image: {{ include "mixingx-audit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.auditWeb) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- name: http
|
||||
|
||||
@@ -19,13 +19,9 @@ spec:
|
||||
app.kubernetes.io/component: audit
|
||||
spec:
|
||||
{{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: audit
|
||||
image: "{{ .Values.registry }}/{{ .Values.images.audit.repository | default "audit" }}:{{ .Values.images.audit.tag | default .Values.tag | default "latest" }}"
|
||||
image: {{ include "mixingx-audit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.audit) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- name: http
|
||||
|
||||
@@ -1,16 +1,13 @@
|
||||
registry: 192.168.1.105:8888/mixingx
|
||||
tag: latest
|
||||
timezone: Asia/Shanghai
|
||||
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
|
||||
imagePullSecrets: []
|
||||
global:
|
||||
imageRegistry: ""
|
||||
|
||||
timezone: Asia/Shanghai
|
||||
|
||||
storage:
|
||||
className: local-path
|
||||
|
||||
sharedInfra:
|
||||
postgres:
|
||||
image: docker.io/library/postgres:17
|
||||
username: postgres
|
||||
password: "Admin12345"
|
||||
port: 5432
|
||||
@@ -31,7 +28,6 @@ audit:
|
||||
ssoBaseUrl: "http://sso-service:8080"
|
||||
# 中心 Audit Broker(ADR-0048)与 audit 专属 PostgreSQL 随本 chart 发布(ADR-0065)
|
||||
mqtt:
|
||||
image: "emqx/nanomq:0.25.2-2"
|
||||
brokerHost: "audit-nanomq-service"
|
||||
brokerPort: 1883
|
||||
managementPort: 8081
|
||||
@@ -45,12 +41,10 @@ audit:
|
||||
concurrency: 4
|
||||
|
||||
images:
|
||||
audit:
|
||||
repository: audit
|
||||
tag: ""
|
||||
auditWeb:
|
||||
repository: audit-web
|
||||
tag: ""
|
||||
audit: { repository: audit, tag: "" }
|
||||
auditWeb: { repository: audit-web, tag: "" }
|
||||
postgres: { repository: postgres, tag: "17" }
|
||||
nanomq: { repository: nanomq, tag: "0.25.2-2" }
|
||||
|
||||
tier:
|
||||
enabled: false
|
||||
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-edge-unit
|
||||
description: "One MixingX edge unit release with durable local revision storage."
|
||||
type: application
|
||||
version: 1.0.9
|
||||
appVersion: "1.0.9"
|
||||
version: 0.1.0
|
||||
appVersion: "1.0.1"
|
||||
@@ -43,6 +43,13 @@ AuditMqttPublisher__NodeId: "{{ .Values.audit.publisher.nodeId | default $name }
|
||||
{{- printf "/%s-%s" .Values.role (.Values.site | toString) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-edge-unit.image" -}}
|
||||
{{- $registry := required "global.imageRegistry is required" .registry -}}
|
||||
{{- $repository := required "image.repository is required" .image.repository -}}
|
||||
{{- $tag := required "image.tag is required" .image.tag -}}
|
||||
{{- printf "%s/%s:%s" (trimSuffix "/" $registry) (trimPrefix "/" $repository) ($tag | toString) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-unit.storageClassName" -}}
|
||||
{{- .Values.storage.className | default "local-path" -}}
|
||||
{{- end -}}
|
||||
|
||||
@@ -23,13 +23,9 @@ spec:
|
||||
app.kubernetes.io/component: {{ $brokerName }}
|
||||
spec:
|
||||
{{ include "mixingx-unit.backendScheduling" . | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: nanomq
|
||||
image: "{{ .Values.mqtt.image.repository }}:{{ .Values.mqtt.image.tag }}"
|
||||
image: {{ include "mixingx-edge-unit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.nanomq) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- name: mqtt
|
||||
|
||||
@@ -55,17 +55,9 @@ spec:
|
||||
secret:
|
||||
secretName: {{ required "edgeSecrets.mounts[].secretName is required" $secret.secretName | quote }}
|
||||
{{- end }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: {{ $name }}
|
||||
{{ $backendImg := .Values.images.backend }}
|
||||
{{ $edgeImg := .Values.images.edge | default dict }}
|
||||
{{ $backendRepo := $edgeImg.repository | default $backendImg.repository }}
|
||||
{{ $backendTag := $edgeImg.tag | default $backendImg.tag | default .Values.tag | default "latest" }}
|
||||
image: {{ .Values.registry }}/{{ $backendRepo }}:{{ $backendTag }}
|
||||
image: {{ include "mixingx-edge-unit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.edge) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- name: http
|
||||
@@ -171,17 +163,9 @@ spec:
|
||||
app.kubernetes.io/component: {{ $webName }}
|
||||
spec:
|
||||
{{ include "mixingx-unit.followerScheduling" . | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: {{ $webName }}
|
||||
{{ $frontendImg := .Values.images.frontend }}
|
||||
{{ $edgeWebImg := .Values.images.edgeWeb | default dict }}
|
||||
{{ $frontendRepo := $edgeWebImg.repository | default $frontendImg.repository }}
|
||||
{{ $frontendTag := $edgeWebImg.tag | default $frontendImg.tag | default .Values.tag | default "latest" }}
|
||||
image: {{ .Values.registry }}/{{ $frontendRepo }}:{{ $frontendTag }}
|
||||
image: {{ include "mixingx-edge-unit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.edgeWeb) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- name: http
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
registry: 192.168.1.105:8888/mixingx
|
||||
tag: latest
|
||||
timezone: Asia/Shanghai
|
||||
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
|
||||
imagePullSecrets: []
|
||||
global:
|
||||
imageRegistry: ""
|
||||
|
||||
timezone: Asia/Shanghai
|
||||
|
||||
role: edge
|
||||
site: "0"
|
||||
@@ -12,14 +10,9 @@ serviceId: ""
|
||||
idWorkerId: 17
|
||||
|
||||
images:
|
||||
backend:
|
||||
repository: edge
|
||||
tag: ""
|
||||
frontend:
|
||||
repository: edge-web
|
||||
tag: ""
|
||||
edge: {}
|
||||
edgeWeb: {}
|
||||
edge: { repository: edge, tag: "" }
|
||||
edgeWeb: { repository: edge-web, tag: "" }
|
||||
nanomq: { repository: nanomq, tag: "0.25.2-2" }
|
||||
|
||||
ports:
|
||||
backend: 8080
|
||||
@@ -65,9 +58,6 @@ sharedInfra:
|
||||
|
||||
mqtt:
|
||||
enabled: true
|
||||
image:
|
||||
repository: emqx/nanomq
|
||||
tag: 0.25.2-2
|
||||
port: 1883
|
||||
wsPort: 8083 # WebSocket listener(NanoMQ 镜像默认开启,路径 /mqtt),供 MQTTX Web 连接
|
||||
credentialRef: "" # 默认空,模板内 default 为 {name}-mqtt
|
||||
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-gateway
|
||||
description: MixingX gateway service, RBAC, and root ingress.
|
||||
type: application
|
||||
version: 1.0.9
|
||||
appVersion: "1.0.9"
|
||||
version: 0.1.0
|
||||
appVersion: "1.0.1"
|
||||
@@ -2,6 +2,13 @@
|
||||
{{- .Values.storage.className | default "local-path" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-gateway.image" -}}
|
||||
{{- $registry := required "global.imageRegistry is required" .registry -}}
|
||||
{{- $repository := required "image.repository is required" .image.repository -}}
|
||||
{{- $tag := required "image.tag is required" .image.tag -}}
|
||||
{{- printf "%s/%s:%s" (trimSuffix "/" $registry) (trimPrefix "/" $repository) ($tag | toString) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-gateway.tierAffinity" -}}
|
||||
{{- $root := .root -}}
|
||||
{{- $role := .role -}}
|
||||
|
||||
@@ -26,13 +26,9 @@ spec:
|
||||
serviceAccountName: gateway-sa
|
||||
{{- end }}
|
||||
{{ include "mixingx-gateway.tierAffinity" (dict "role" "gateway" "root" $) | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: gateway
|
||||
image: {{ .Values.registry }}/{{ $gatewayImage.repository | default "gateway" }}:{{ $gatewayImage.tag | default .Values.tag | default "latest" }}
|
||||
image: {{ include "mixingx-gateway.image" (dict "registry" .Values.global.imageRegistry "image" $gatewayImage) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- name: http
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
registry: 192.168.1.119:8888/mixingx
|
||||
tag: latest
|
||||
timezone: Asia/Shanghai
|
||||
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
|
||||
imagePullSecrets: []
|
||||
global:
|
||||
imageRegistry: ""
|
||||
|
||||
timezone: Asia/Shanghai
|
||||
|
||||
storage:
|
||||
className: local-path
|
||||
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-infra
|
||||
description: MixingX shared infrastructure services (Redis, MongoDB, RabbitMQ).
|
||||
type: application
|
||||
version: 1.0.9
|
||||
appVersion: "1.0.9"
|
||||
version: 0.1.0
|
||||
appVersion: "1.0.1"
|
||||
@@ -2,6 +2,13 @@
|
||||
{{- .Values.storage.className | default "local-path" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-infra.image" -}}
|
||||
{{- $registry := required "global.imageRegistry is required" .registry -}}
|
||||
{{- $repository := required "image.repository is required" .image.repository -}}
|
||||
{{- $tag := required "image.tag is required" .image.tag -}}
|
||||
{{- printf "%s/%s:%s" (trimSuffix "/" $registry) (trimPrefix "/" $repository) ($tag | toString) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-infra.tierAffinity" -}}
|
||||
{{- $root := .root -}}
|
||||
{{- $role := .role -}}
|
||||
|
||||
@@ -31,13 +31,10 @@ spec:
|
||||
app.kubernetes.io/component: {{ .name }}
|
||||
spec:
|
||||
{{ include "mixingx-infra.tierAffinity" (dict "role" "sharedDatastores" "root" $root) | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: {{ .name }}
|
||||
image: {{ .image }}
|
||||
{{ $image := index $root.Values.images .image }}
|
||||
image: {{ include "mixingx-infra.image" (dict "registry" $root.Values.global.imageRegistry "image" $image) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- name: tcp
|
||||
|
||||
@@ -1,16 +1,13 @@
|
||||
registry: 192.168.1.105:8888/mixingx
|
||||
tag: latest
|
||||
timezone: Asia/Shanghai
|
||||
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
|
||||
imagePullSecrets: []
|
||||
global:
|
||||
imageRegistry: ""
|
||||
|
||||
timezone: Asia/Shanghai
|
||||
|
||||
storage:
|
||||
className: local-path
|
||||
|
||||
sharedInfra:
|
||||
postgres:
|
||||
image: docker.io/library/postgres:17
|
||||
username: postgres
|
||||
password: "Admin12345"
|
||||
port: 5432
|
||||
@@ -39,19 +36,25 @@ tier:
|
||||
services:
|
||||
sharedDatastores: { mode: required, tiers: [infra] }
|
||||
|
||||
images:
|
||||
postgres: { repository: postgres, tag: "17" }
|
||||
redis: { repository: redis, tag: "8.6" }
|
||||
mongo: { repository: mongo, tag: "8.3" }
|
||||
rabbitmq: { repository: rabbitmq, tag: "4.3-management" }
|
||||
|
||||
sharedDatastores:
|
||||
- name: redis
|
||||
image: docker.io/library/redis:8.6
|
||||
image: redis
|
||||
port: 6379
|
||||
storage: 2Gi
|
||||
mountPath: /data
|
||||
- name: mongo
|
||||
image: docker.io/library/mongo:8.3
|
||||
image: mongo
|
||||
port: 27017
|
||||
storage: 5Gi
|
||||
mountPath: /data/db
|
||||
- name: messaging
|
||||
image: docker.io/library/rabbitmq:4.3-management
|
||||
image: rabbitmq
|
||||
port: 5672
|
||||
storage: 2Gi
|
||||
mountPath: /var/lib/rabbitmq
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-mqttx
|
||||
description: MixingX MQTTX Web — 浏览器端 MQTT 客户端,用于监控/调试各 Edge 的 NanoMQ broker。
|
||||
type: application
|
||||
version: 1.0.9
|
||||
appVersion: "1.0.9"
|
||||
version: 0.1.0
|
||||
appVersion: "1.0.1"
|
||||
@@ -4,3 +4,10 @@
|
||||
{{- define "mixingx-mqttx.name" -}}
|
||||
{{- .Values.mqttx.name | default "mqttx" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-mqttx.image" -}}
|
||||
{{- $registry := required "global.imageRegistry is required" .registry -}}
|
||||
{{- $repository := required "image.repository is required" .image.repository -}}
|
||||
{{- $tag := required "image.tag is required" .image.tag -}}
|
||||
{{- printf "%s/%s:%s" (trimSuffix "/" $registry) (trimPrefix "/" $repository) ($tag | toString) -}}
|
||||
{{- end -}}
|
||||
@@ -19,13 +19,9 @@ spec:
|
||||
labels:
|
||||
app.kubernetes.io/component: {{ $name }}
|
||||
spec:
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: {{ $name }}
|
||||
image: "{{ .Values.mqttx.image.repository }}:{{ .Values.mqttx.image.tag | default "latest" }}"
|
||||
image: {{ include "mixingx-mqttx.image" (dict "registry" .Values.global.imageRegistry "image" .Values.mqttx.image) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
# emqx/mqttx-web 镜像默认 http-server 未显式绑 0.0.0.0,导致只听 loopback、
|
||||
# Service/Pod IP 进不来。显式覆盖启动参数,强制监听所有接口。
|
||||
|
||||
@@ -9,17 +9,17 @@
|
||||
#
|
||||
# Ingress:demo 环境有 *.mixingx.local DNS,用 host 暴露;无 DNS 的现场改用 NodePort。
|
||||
|
||||
timezone: Asia/Shanghai
|
||||
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
|
||||
imagePullSecrets: []
|
||||
global:
|
||||
imageRegistry: ""
|
||||
|
||||
timezone: Asia/Shanghai
|
||||
|
||||
mqttx:
|
||||
name: mqttx
|
||||
replicas: 1
|
||||
image:
|
||||
repository: emqx/mqttx-web
|
||||
tag: latest
|
||||
repository: mqttx-web
|
||||
tag: ""
|
||||
description: "MQTT 监控客户端"
|
||||
|
||||
ingress:
|
||||
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-network-agent
|
||||
description: "MixingX network console agent: 每节点常驻,提供主机网口(IP/掩码/网关/DNS)与 WiFi 的可视化配置 API。"
|
||||
type: application
|
||||
version: 1.0.9
|
||||
appVersion: "1.0.9"
|
||||
version: 0.1.0
|
||||
appVersion: "1.0.1"
|
||||
@@ -51,10 +51,13 @@ spec:
|
||||
- name: K3S_RESTART_ON_IP_CHANGE
|
||||
value: {{ .Values.k3sRestartOnIpChange | quote }}
|
||||
securityContext:
|
||||
# 只需 root + D-Bus socket,无需 privileged 与额外 capability:
|
||||
# nmcli 经 D-Bus 操作主机 NM,特权动作(改 IP/路由)全部由 NM 进程执行
|
||||
# 只需 root + D-Bus socket,无需 privileged
|
||||
# NET_ADMIN: 清除切换静态后残留的动态地址(ip addr del 需要此能力)
|
||||
runAsUser: 0
|
||||
allowPrivilegeEscalation: false
|
||||
capabilities:
|
||||
add:
|
||||
- NET_ADMIN
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /api/network/health
|
||||
@@ -77,8 +80,15 @@ spec:
|
||||
# 主机 system bus: nmcli 与 systemd 重启都走它
|
||||
- name: dbus
|
||||
mountPath: /run/dbus/system_bus_socket
|
||||
- name: nm-run
|
||||
mountPath: /run/NetworkManager
|
||||
readOnly: true
|
||||
volumes:
|
||||
- name: dbus
|
||||
hostPath:
|
||||
path: /run/dbus/system_bus_socket
|
||||
type: Socket
|
||||
- name: nm-run
|
||||
hostPath:
|
||||
path: /run/NetworkManager
|
||||
type: DirectoryOrCreate
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-platform
|
||||
description: MixingX central platform services without customer edge/agent instances.
|
||||
type: application
|
||||
version: 1.0.9
|
||||
appVersion: "1.0.9"
|
||||
version: 0.1.0
|
||||
appVersion: "1.0.1"
|
||||
@@ -2,6 +2,13 @@
|
||||
{{- .Values.storage.className | default "local-path" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-platform.image" -}}
|
||||
{{- $registry := required "global.imageRegistry is required" .registry -}}
|
||||
{{- $repository := required "image.repository is required" .image.repository -}}
|
||||
{{- $tag := required "image.tag is required" .image.tag -}}
|
||||
{{- printf "%s/%s:%s" (trimSuffix "/" $registry) (trimPrefix "/" $repository) ($tag | toString) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-platform.tierAffinity" -}}
|
||||
{{- $root := .root -}}
|
||||
{{- $role := .role -}}
|
||||
|
||||
@@ -25,13 +25,10 @@ spec:
|
||||
serviceAccountName: gateway-sa
|
||||
{{- end }}
|
||||
{{ include "mixingx-platform.tierAffinity" (dict "role" .role "root" $root) | nindent 6 }}
|
||||
{{- with $root.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: {{ .name }}
|
||||
image: {{ $root.Values.registry }}/{{ .image }}:{{ $root.Values.tag | default "latest" }}
|
||||
{{ $image := index $root.Values.images .image }}
|
||||
image: {{ include "mixingx-platform.image" (dict "registry" $root.Values.global.imageRegistry "image" $image) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- name: http
|
||||
@@ -160,13 +157,10 @@ spec:
|
||||
app.kubernetes.io/component: {{ .name }}
|
||||
spec:
|
||||
{{ include "mixingx-platform.tierAffinity" (dict "role" .tierRole "root" $root) | nindent 6 }}
|
||||
{{- with $root.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: {{ .name }}
|
||||
image: {{ $root.Values.registry }}/{{ .image }}:{{ $root.Values.tag | default "latest" }}
|
||||
{{ $image := index $root.Values.images .image }}
|
||||
image: {{ include "mixingx-platform.image" (dict "registry" $root.Values.global.imageRegistry "image" $image) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- name: http
|
||||
@@ -232,13 +226,9 @@ spec:
|
||||
app.kubernetes.io/component: {{ .name }}-postgres
|
||||
spec:
|
||||
{{ include "mixingx-platform.tierAffinity" (dict "role" .tierRole "root" $root) | nindent 6 }}
|
||||
{{- with $root.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: postgres
|
||||
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
||||
image: {{ include "mixingx-platform.image" (dict "registry" $root.Values.global.imageRegistry "image" $root.Values.images.postgres) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
env:
|
||||
- name: POSTGRES_PASSWORD
|
||||
|
||||
@@ -20,13 +20,10 @@ spec:
|
||||
app.kubernetes.io/component: audit
|
||||
spec:
|
||||
{{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: audit
|
||||
image: "{{ .Values.registry }}/{{ .Values.audit.image }}:{{ .Values.tag | default "latest" }}"
|
||||
{{ $auditImage := index .Values.images .Values.audit.image }}
|
||||
image: {{ include "mixingx-platform.image" (dict "registry" .Values.global.imageRegistry "image" $auditImage) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- name: http
|
||||
@@ -145,13 +142,10 @@ spec:
|
||||
app.kubernetes.io/component: {{ .Values.audit.webName }}
|
||||
spec:
|
||||
{{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: {{ .Values.audit.webName }}
|
||||
image: "{{ .Values.registry }}/{{ .Values.audit.webImage }}:{{ .Values.tag | default "latest" }}"
|
||||
{{ $auditWebImage := index .Values.images .Values.audit.webImage }}
|
||||
image: {{ include "mixingx-platform.image" (dict "registry" .Values.global.imageRegistry "image" $auditWebImage) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- name: http
|
||||
@@ -214,13 +208,9 @@ spec:
|
||||
app.kubernetes.io/component: {{ .Values.audit.database }}-postgres
|
||||
spec:
|
||||
{{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: postgres
|
||||
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
||||
image: {{ include "mixingx-platform.image" (dict "registry" $root.Values.global.imageRegistry "image" $root.Values.images.postgres) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
env:
|
||||
- name: POSTGRES_PASSWORD
|
||||
|
||||
@@ -31,13 +31,10 @@ spec:
|
||||
app.kubernetes.io/component: {{ .name }}
|
||||
spec:
|
||||
{{ include "mixingx-platform.tierAffinity" (dict "role" "sharedDatastores" "root" $root) | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: {{ .name }}
|
||||
image: {{ .image }}
|
||||
{{ $image := index $root.Values.images .image }}
|
||||
image: {{ include "mixingx-platform.image" (dict "registry" $root.Values.global.imageRegistry "image" $image) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- name: tcp
|
||||
|
||||
@@ -1,16 +1,13 @@
|
||||
registry: 192.168.1.105:8888/mixingx
|
||||
tag: latest
|
||||
timezone: Asia/Shanghai
|
||||
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
|
||||
imagePullSecrets: []
|
||||
global:
|
||||
imageRegistry: ""
|
||||
|
||||
timezone: Asia/Shanghai
|
||||
|
||||
storage:
|
||||
className: local-path
|
||||
|
||||
sharedInfra:
|
||||
postgres:
|
||||
image: docker.io/library/postgres:17
|
||||
username: postgres
|
||||
password: "Admin12345"
|
||||
port: 5432
|
||||
@@ -43,12 +40,26 @@ tier:
|
||||
audit: { mode: required, tiers: [infra] }
|
||||
sharedDatastores: { mode: required, tiers: [infra] }
|
||||
|
||||
images:
|
||||
gateway: { repository: gateway, tag: "" }
|
||||
sso: { repository: sso, tag: "" }
|
||||
ssoWeb: { repository: sso-web, tag: "" }
|
||||
ultra: { repository: ultra, tag: "" }
|
||||
ultraWeb: { repository: ultra-web, tag: "" }
|
||||
audit: { repository: audit, tag: "" }
|
||||
auditWeb: { repository: audit-web, tag: "" }
|
||||
postgres: { repository: postgres, tag: "17" }
|
||||
redis: { repository: redis, tag: "8.6" }
|
||||
mongo: { repository: mongo, tag: "8.3" }
|
||||
rabbitmq: { repository: rabbitmq, tag: "4.3-management" }
|
||||
nanomq: { repository: nanomq, tag: "0.25.2-2" }
|
||||
|
||||
standalones:
|
||||
- name: sso
|
||||
image: sso
|
||||
role: sso
|
||||
webName: sso-web
|
||||
webImage: sso-web
|
||||
webImage: ssoWeb
|
||||
webBasePath: /sso/
|
||||
serviceId: sso
|
||||
database: sso-db
|
||||
@@ -60,7 +71,7 @@ standalones:
|
||||
image: ultra
|
||||
role: ultra
|
||||
webName: ultra-web
|
||||
webImage: ultra-web
|
||||
webImage: ultraWeb
|
||||
webBasePath: /ultra/
|
||||
serviceId: ultra
|
||||
database: ultra-db
|
||||
@@ -80,7 +91,7 @@ audit:
|
||||
port: 5900
|
||||
replicas: 2
|
||||
webName: audit-web
|
||||
webImage: audit-web
|
||||
webImage: auditWeb
|
||||
webBasePath: /audit/
|
||||
webPort: 8900
|
||||
database: audit-db
|
||||
@@ -99,22 +110,22 @@ audit:
|
||||
|
||||
sharedDatastores:
|
||||
- name: redis
|
||||
image: docker.io/library/redis:8.6
|
||||
image: redis
|
||||
port: 6379
|
||||
storage: 2Gi
|
||||
mountPath: /data
|
||||
- name: mongo
|
||||
image: docker.io/library/mongo:8.3
|
||||
image: mongo
|
||||
port: 27017
|
||||
storage: 5Gi
|
||||
mountPath: /data/db
|
||||
- name: messaging
|
||||
image: docker.io/library/rabbitmq:4.3-management
|
||||
image: rabbitmq
|
||||
port: 5672
|
||||
storage: 2Gi
|
||||
mountPath: /var/lib/rabbitmq
|
||||
- name: audit-nanomq
|
||||
image: emqx/nanomq:0.25.2-2
|
||||
image: nanomq
|
||||
port: 1883
|
||||
storage: 1Gi
|
||||
mountPath: /var/lib/nanomq
|
||||
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-protocol-server-unit
|
||||
description: Deploy one MixingX edge protocol test server instance.
|
||||
type: application
|
||||
version: 1.0.9
|
||||
appVersion: "1.0.9"
|
||||
version: 0.1.0
|
||||
appVersion: "1.0.0"
|
||||
@@ -0,0 +1,6 @@
|
||||
{{- define "mixingx-protocol-server-unit.image" -}}
|
||||
{{- $registry := required "global.imageRegistry is required" .registry -}}
|
||||
{{- $repository := required "image.repository is required" .image.repository -}}
|
||||
{{- $tag := required "image.tag is required" .image.tag -}}
|
||||
{{- printf "%s/%s:%s" (trimSuffix "/" $registry) (trimPrefix "/" $repository) ($tag | toString) -}}
|
||||
{{- end -}}
|
||||
@@ -24,13 +24,9 @@ spec:
|
||||
{{ toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- $proto := index .Values.images.protocol .Values.type }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: protocol-server
|
||||
image: {{ .Values.registry }}/{{ $proto.repository | default .Values.image }}:{{ $proto.tag | default .Values.tag | default "latest" }}
|
||||
image: {{ include "mixingx-protocol-server-unit.image" (dict "registry" .Values.global.imageRegistry "image" $proto) | quote }}
|
||||
imagePullPolicy: {{ .Values.imagePullPolicy }}
|
||||
args:
|
||||
- "--port"
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
registry: 192.168.1.105:8888/mixingx
|
||||
tag: latest
|
||||
timezone: Asia/Shanghai
|
||||
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
|
||||
imagePullSecrets: []
|
||||
global:
|
||||
imageRegistry: ""
|
||||
|
||||
timezone: Asia/Shanghai
|
||||
|
||||
# Legacy image override (kept for backward compatibility).
|
||||
type: opcua
|
||||
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-sso
|
||||
description: MixingX SSO standalone release (backend, web, and PostgreSQL).
|
||||
type: application
|
||||
version: 1.0.9
|
||||
appVersion: "1.0.9"
|
||||
version: 0.1.0
|
||||
appVersion: "1.0.1"
|
||||
@@ -2,6 +2,13 @@
|
||||
{{- .Values.storage.className | default "local-path" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-sso.image" -}}
|
||||
{{- $registry := required "global.imageRegistry is required" .registry -}}
|
||||
{{- $repository := required "image.repository is required" .image.repository -}}
|
||||
{{- $tag := required "image.tag is required" .image.tag -}}
|
||||
{{- printf "%s/%s:%s" (trimSuffix "/" $registry) (trimPrefix "/" $repository) ($tag | toString) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-sso.configData" -}}
|
||||
{{- $root := . -}}
|
||||
{{- $name := $root.Values.sso.name -}}
|
||||
|
||||
@@ -28,13 +28,9 @@ spec:
|
||||
app.kubernetes.io/component: {{ $name }}
|
||||
spec:
|
||||
{{ include "mixingx-sso.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: {{ $name }}
|
||||
image: {{ $root.Values.registry }}/{{ $root.Values.images.sso.repository | default "sso" }}:{{ $root.Values.images.sso.tag | default $root.Values.tag | default "latest" }}
|
||||
image: {{ include "mixingx-sso.image" (dict "registry" $root.Values.global.imageRegistry "image" $root.Values.images.sso) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- name: http
|
||||
@@ -130,13 +126,9 @@ spec:
|
||||
app.kubernetes.io/component: {{ $webName }}
|
||||
spec:
|
||||
{{ include "mixingx-sso.tierAffinity" (dict "role" "web" "root" $root) | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: {{ $webName }}
|
||||
image: {{ $root.Values.registry }}/{{ $root.Values.images.ssoWeb.repository | default "sso-web" }}:{{ $root.Values.images.ssoWeb.tag | default $root.Values.tag | default "latest" }}
|
||||
image: {{ include "mixingx-sso.image" (dict "registry" $root.Values.global.imageRegistry "image" $root.Values.images.ssoWeb) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- name: http
|
||||
@@ -198,13 +190,9 @@ spec:
|
||||
app.kubernetes.io/component: {{ $name }}-postgres
|
||||
spec:
|
||||
{{ include "mixingx-sso.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: postgres
|
||||
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
||||
image: {{ include "mixingx-sso.image" (dict "registry" $root.Values.global.imageRegistry "image" $root.Values.images.postgres) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
env:
|
||||
- name: POSTGRES_PASSWORD
|
||||
|
||||
@@ -1,16 +1,13 @@
|
||||
registry: 192.168.1.105:8888/mixingx
|
||||
tag: latest
|
||||
timezone: Asia/Shanghai
|
||||
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
|
||||
imagePullSecrets: []
|
||||
global:
|
||||
imageRegistry: ""
|
||||
|
||||
timezone: Asia/Shanghai
|
||||
|
||||
storage:
|
||||
className: local-path
|
||||
|
||||
sharedInfra:
|
||||
postgres:
|
||||
image: docker.io/library/postgres:17
|
||||
username: postgres
|
||||
password: "Admin12345"
|
||||
port: 5432
|
||||
@@ -45,9 +42,6 @@ audit:
|
||||
brokerUrl: "mqtt://audit-nanomq-service:1883"
|
||||
|
||||
images:
|
||||
sso:
|
||||
repository: sso
|
||||
tag: ""
|
||||
ssoWeb:
|
||||
repository: sso-web
|
||||
tag: ""
|
||||
sso: { repository: sso, tag: "" }
|
||||
ssoWeb: { repository: sso-web, tag: "" }
|
||||
postgres: { repository: postgres, tag: "17" }
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-ultra
|
||||
description: "MixingX Ultra dashboard standalone release: ultra backend, ultra web, and ultra PostgreSQL."
|
||||
type: application
|
||||
version: 1.0.9
|
||||
appVersion: "1.0.9"
|
||||
version: 0.1.0
|
||||
appVersion: "1.0.1"
|
||||
@@ -2,6 +2,13 @@
|
||||
{{- .Values.storage.className | default "local-path" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-ultra.image" -}}
|
||||
{{- $registry := required "global.imageRegistry is required" .registry -}}
|
||||
{{- $repository := required "image.repository is required" .image.repository -}}
|
||||
{{- $tag := required "image.tag is required" .image.tag -}}
|
||||
{{- printf "%s/%s:%s" (trimSuffix "/" $registry) (trimPrefix "/" $repository) ($tag | toString) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-ultra.configData" -}}
|
||||
{{- $root := . -}}
|
||||
{{- $cfg := $root.Values.ultra -}}
|
||||
|
||||
@@ -33,13 +33,9 @@ spec:
|
||||
app.kubernetes.io/component: {{ $name }}
|
||||
spec:
|
||||
{{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: {{ $name }}
|
||||
image: {{ $root.Values.registry }}/{{ $root.Values.images.ultra.repository | default "ultra" }}:{{ $root.Values.images.ultra.tag | default $root.Values.tag | default "latest" }}
|
||||
image: {{ include "mixingx-ultra.image" (dict "registry" $root.Values.global.imageRegistry "image" $root.Values.images.ultra) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- name: http
|
||||
@@ -133,13 +129,9 @@ spec:
|
||||
app.kubernetes.io/component: {{ $name }}-web
|
||||
spec:
|
||||
{{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: {{ $name }}-web
|
||||
image: {{ $root.Values.registry }}/{{ $root.Values.images.ultraWeb.repository | default "ultra-web" }}:{{ $root.Values.images.ultraWeb.tag | default $root.Values.tag | default "latest" }}
|
||||
image: {{ include "mixingx-ultra.image" (dict "registry" $root.Values.global.imageRegistry "image" $root.Values.images.ultraWeb) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- name: http
|
||||
@@ -201,13 +193,9 @@ spec:
|
||||
app.kubernetes.io/component: {{ $name }}-postgres
|
||||
spec:
|
||||
{{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: postgres
|
||||
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
||||
image: {{ include "mixingx-ultra.image" (dict "registry" $root.Values.global.imageRegistry "image" $root.Values.images.postgres) | quote }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
env:
|
||||
- name: POSTGRES_PASSWORD
|
||||
|
||||
@@ -1,16 +1,13 @@
|
||||
registry: 192.168.1.105:8888/mixingx
|
||||
tag: latest
|
||||
timezone: Asia/Shanghai
|
||||
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
|
||||
imagePullSecrets: []
|
||||
global:
|
||||
imageRegistry: ""
|
||||
|
||||
timezone: Asia/Shanghai
|
||||
|
||||
storage:
|
||||
className: local-path
|
||||
|
||||
sharedInfra:
|
||||
postgres:
|
||||
image: docker.io/library/postgres:17
|
||||
username: postgres
|
||||
password: "Admin12345"
|
||||
port: 5432
|
||||
@@ -28,12 +25,9 @@ sharedInfra:
|
||||
protocol: grpc
|
||||
|
||||
images:
|
||||
ultra:
|
||||
repository: ultra
|
||||
tag: ""
|
||||
ultraWeb:
|
||||
repository: ultra-web
|
||||
tag: ""
|
||||
ultra: { repository: ultra, tag: "" }
|
||||
ultraWeb: { repository: ultra-web, tag: "" }
|
||||
postgres: { repository: postgres, tag: "17" }
|
||||
|
||||
ultra:
|
||||
name: ultra
|
||||
|
||||
Reference in new issue
Block a user