Compare commits

..
Author SHA1 Message Date
王野 d7366869ed feat(helm): 统一镜像地址配置规范并更新CI示例
- 添加global.imageRegistry作为统一镜像仓库地址配置项
- 创建通用image模板函数处理镜像地址拼接逻辑
- 更新所有chart使用新的镜像配置结构
- 在README中添加镜像地址约定说明
- 修改CI命令示例以包含必要的镜像配置参数
- 将硬编码的镜像地址改为通过values动态配置
2026-11-03 09:52:35 +08:00
64 changed files with 595 additions and 561 deletions

No files matched your search

+20 -2
View File
@@ -27,14 +27,32 @@
CI 只对 `release-charts/` 做 lint/template(见 hub `.drone.yml`): CI 只对 `release-charts/` 做 lint/template(见 hub `.drone.yml`):
```bash ```bash
helm lint release-charts/mixingx-edge-unit helm lint release-charts/mixingx-edge-unit \
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
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 部署 ### ArgoCD 部署
`mixingx-deploy` 的 ApplicationSet 按 unit chart 逐个发布,每个 edge/agent 一个独立 Helm release。详见 `mixingx-deploy/`。 `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) — 全项目指南 - hub [AGENTS.md](https://gitee.com/mixing-tech/mixingx.hub) — 全项目指南
-23
View File
@@ -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,存量备用
-1
View File
@@ -10,7 +10,6 @@ This directory contains the release-oriented charts for Phase 1 ownership split:
- `mixingx-edge-unit`: one edge site release. - `mixingx-edge-unit`: one edge site release.
- `mixingx-agent-unit`: one agent site release. - `mixingx-agent-unit`: one agent site release.
- `mixingx-protocol-server-unit`: one protocol mock server instance. - `mixingx-protocol-server-unit`: one protocol mock server instance.
- `mixingx-codeserver`: browser VS Code test IDE (code-server, plugins bundled in image).
- `mixingx-platform`: **legacy** central-services chart, kept for compatibility during migration. - `mixingx-platform`: **legacy** central-services chart, kept for compatibility during migration.
The chart at the repository root is kept as a legacy all-in-one chart during migration. The chart at the repository root is kept as a legacy all-in-one chart during migration.
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-agent-unit name: mixingx-agent-unit
description: "One MixingX agent unit release: agent backend, agent web, and agent PostgreSQL." description: "One MixingX agent unit release: agent backend, agent web, and agent PostgreSQL."
type: application type: application
version: 1.0.55 version: 0.1.1
appVersion: "1.0.55" appVersion: "1.0.1"
+7 -5
View File
@@ -6,11 +6,12 @@ Deploys one agent site as one Helm release:
- `agent-web-<site>` frontend - `agent-web-<site>` frontend
- `agent-<site>-postgres` StatefulSet and retained PVC - `agent-<site>-postgres` StatefulSet and retained PVC
Agent PostgreSQL sessions set `idle_in_transaction_session_timeout` through the The release requires a pre-created PostgreSQL credentials Secret. By default its
connection string. The default is `60s`, configurable with name is `agent-<site>-postgres-credentials`; the required keys are
`sharedInfra.postgres.idleInTransactionSessionTimeout`. This is a database-side `admin-password`, `app-password`, and `connection-string`. The Agent connection
safety net for leaked idle transactions and does not change database users, string must use `sharedInfra.postgres.appUsername`, while the init container uses
passwords, roles, or the PostgreSQL StatefulSet credential model. the administrator credential only to idempotently provision the non-superuser
application role and its database-local idle transaction timeout.
Example: Example:
@@ -20,5 +21,6 @@ helm upgrade --install mixingx-agent-workshop-a ./charts/mixingx-agent-unit \
--set site=workshop-a \ --set site=workshop-a \
--set nodeName=agent-node-01 \ --set nodeName=agent-node-01 \
--set storage.className=longhorn \ --set storage.className=longhorn \
--set sharedInfra.postgres.appUsername=agent_workshop_a \
--set tag=2026.07.02-abc1234 --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" .) -}} {{- .Values.serviceId | default (include "mixingx-unit.name" .) -}}
{{- end -}} {{- end -}}
{{- define "mixingx-unit.postgresCredentialsSecretName" -}}
{{- .Values.sharedInfra.postgres.credentialsSecret.name | default (printf "%s-postgres-credentials" (include "mixingx-unit.name" .)) -}}
{{- end -}}
{{- define "mixingx-unit.basePath" -}} {{- define "mixingx-unit.basePath" -}}
{{- printf "/%s-%s" .Values.role (.Values.site | toString) -}} {{- printf "/%s-%s" .Values.role (.Values.site | toString) -}}
{{- end -}} {{- 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" -}} {{- define "mixingx-unit.storageClassName" -}}
{{- .Values.storage.className | default "local-path" -}} {{- .Values.storage.className | default "local-path" -}}
{{- end -}} {{- end -}}
@@ -59,7 +70,8 @@ REDIS_HOST: "{{ .Values.sharedInfra.redis.host }}"
REDIS_PORT: "{{ .Values.sharedInfra.redis.port }}" REDIS_PORT: "{{ .Values.sharedInfra.redis.port }}"
POSTGRESQL_HOST: "{{ $pgHost }}" POSTGRESQL_HOST: "{{ $pgHost }}"
POSTGRESQL_PORT: "{{ .Values.sharedInfra.postgres.port }}" 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_HOST: "{{ .Values.sharedInfra.rabbitmq.host }}"
MESSAGING_PORT: "{{ .Values.sharedInfra.rabbitmq.port }}" MESSAGING_PORT: "{{ .Values.sharedInfra.rabbitmq.port }}"
MESSAGING_USERNAME: "{{ .Values.sharedInfra.rabbitmq.username }}" 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" . -}} {{- $serviceId := include "mixingx-unit.serviceId" . -}}
{{- $basePath := include "mixingx-unit.basePath" . -}} {{- $basePath := include "mixingx-unit.basePath" . -}}
{{- $pgHost := printf "%s-postgres-service" $name -}} {{- $pgHost := printf "%s-postgres-service" $name -}}
{{- $pgCredentialsSecretName := include "mixingx-unit.postgresCredentialsSecretName" . -}}
--- ---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
@@ -24,19 +25,61 @@ spec:
app.kubernetes.io/component: {{ $name }} app.kubernetes.io/component: {{ $name }}
annotations: annotations:
checksum/config: {{ include "mixingx-unit.backendConfigData" . | sha256sum }} checksum/config: {{ include "mixingx-unit.backendConfigData" . | sha256sum }}
checksum/postgres-role-sql: {{ .Files.Get "files/provision-agent-role.sql" | sha256sum }}
spec: spec:
{{ include "mixingx-unit.backendScheduling" . | nindent 6 }} {{ include "mixingx-unit.backendScheduling" . | nindent 6 }}
{{- with $.Values.imagePullSecrets }} initContainers:
imagePullSecrets: - name: provision-postgres-role
{{- toYaml . | nindent 8 }} image: {{ .Values.images.postgres.repository }}:{{ .Values.images.postgres.tag | default "latest" }}
{{- end }} 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: containers:
- name: {{ $name }} - name: {{ $name }}
{{ $backendImg := .Values.images.backend }} image: {{ include "mixingx-agent-unit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.agent) | quote }}
{{ $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 }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -50,6 +93,16 @@ spec:
env: env:
- name: TZ - name: TZ
value: "{{ .Values.timezone | default "Asia/Shanghai" }}" 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: livenessProbe:
httpGet: httpGet:
path: /health path: /health
@@ -66,6 +119,10 @@ spec:
periodSeconds: 30 periodSeconds: 30
timeoutSeconds: 10 timeoutSeconds: 10
failureThreshold: 8 failureThreshold: 8
volumes:
- name: postgres-role-provisioning
configMap:
name: {{ $name }}-postgres-role-provisioning
--- ---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
@@ -103,10 +160,6 @@ stringData:
ConnectionStrings__redis: "{{ .Values.sharedInfra.redis.host }}:{{ .Values.sharedInfra.redis.port }},password={{ .Values.sharedInfra.redis.password }}" ConnectionStrings__redis: "{{ .Values.sharedInfra.redis.host }}:{{ .Values.sharedInfra.redis.port }},password={{ .Values.sharedInfra.redis.password }}"
REDIS_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 }}" 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 }}" 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_PASSWORD: "{{ .Values.sharedInfra.rabbitmq.password }}"
MESSAGING_URI: "amqp://{{ .Values.sharedInfra.rabbitmq.username }}:{{ .Values.sharedInfra.rabbitmq.password }}@{{ .Values.sharedInfra.rabbitmq.host }}:{{ .Values.sharedInfra.rabbitmq.port }}" 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 }} app.kubernetes.io/component: {{ $webName }}
spec: spec:
{{ include "mixingx-unit.followerScheduling" . | nindent 6 }} {{ include "mixingx-unit.followerScheduling" . | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ $webName }} - name: {{ $webName }}
{{ $frontendImg := .Values.images.frontend }} image: {{ include "mixingx-agent-unit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.agentWeb) | quote }}
{{ $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 }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -208,21 +253,20 @@ spec:
app.kubernetes.io/component: {{ $name }}-postgres app.kubernetes.io/component: {{ $name }}-postgres
spec: spec:
{{ include "mixingx-unit.followerScheduling" . | nindent 6 }} {{ include "mixingx-unit.followerScheduling" . | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: postgres - 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 imagePullPolicy: IfNotPresent
env: env:
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
value: "{{ .Values.sharedInfra.postgres.password }}" valueFrom:
secretKeyRef:
name: {{ $pgCredentialsSecretName }}
key: {{ .Values.sharedInfra.postgres.credentialsSecret.adminPasswordKey }}
- name: POSTGRES_DB - name: POSTGRES_DB
value: "{{ $database }}" value: "{{ $database }}"
- name: POSTGRES_USER - name: POSTGRES_USER
value: "{{ .Values.sharedInfra.postgres.username }}" value: "{{ .Values.sharedInfra.postgres.adminUsername }}"
- name: PGDATA - name: PGDATA
value: /var/lib/postgresql/data/pgdata value: /var/lib/postgresql/data/pgdata
ports: ports:
+14 -18
View File
@@ -1,9 +1,7 @@
registry: 192.168.1.105:8888/mixingx global:
tag: latest imageRegistry: ""
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
timezone: Asia/Shanghai
role: agent role: agent
site: "0" site: "0"
@@ -13,17 +11,9 @@ phaseType: "" # 工序类型(对应 apphost 的 AGENT_PHASE_TYPE,如 DieC
database: "" database: ""
images: images:
backend: agent: { repository: agent, tag: "" }
repository: agent agentWeb: { repository: agent-web, tag: "" }
tag: "" postgres: { repository: postgres, tag: "17" }
frontend:
repository: agent-web
tag: ""
postgres:
repository: docker.io/library/postgres
tag: "17"
agent: {}
agentWeb: {}
ports: ports:
backend: 8080 backend: 8080
@@ -45,10 +35,16 @@ sharedInfra:
host: ultra-service host: ultra-service
port: 8080 port: 8080
postgres: postgres:
username: postgres adminUsername: postgres
password: "Admin12345" appUsername: agent_runtime
port: 5432 port: 5432
idleInTransactionSessionTimeout: 60s idleInTransactionSessionTimeout: 60s
credentialsSecret:
# Leave empty to use <role>-<site>-postgres-credentials.
name: ""
adminPasswordKey: admin-password
appPasswordKey: app-password
connectionStringKey: connection-string
redis: redis:
host: redis-service host: redis-service
port: 6379 port: 6379
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-audit name: mixingx-audit
description: MixingX audit service. description: MixingX audit service.
type: application type: application
version: 1.0.55 version: 0.1.0
appVersion: "1.0.55" appVersion: "1.0.1"
@@ -2,6 +2,13 @@
{{- .Values.storage.className | default "local-path" -}} {{- .Values.storage.className | default "local-path" -}}
{{- end -}} {{- 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" -}} {{- define "mixingx-audit.tierAffinity" -}}
{{- $root := .root -}} {{- $root := .root -}}
{{- $role := .role -}} {{- $role := .role -}}
@@ -32,13 +32,9 @@ spec:
app.kubernetes.io/component: {{ .Values.audit.database }}-postgres app.kubernetes.io/component: {{ .Values.audit.database }}-postgres
spec: spec:
{{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }} {{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: postgres - 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 imagePullPolicy: IfNotPresent
env: env:
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
@@ -22,13 +22,9 @@ spec:
app.kubernetes.io/component: audit-nanomq app.kubernetes.io/component: audit-nanomq
spec: spec:
{{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }} {{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: nanomq - 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 imagePullPolicy: IfNotPresent
command: ["/bin/sh"] command: ["/bin/sh"]
args: args:
@@ -20,13 +20,9 @@ spec:
app.kubernetes.io/component: audit-web app.kubernetes.io/component: audit-web
spec: spec:
{{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }} {{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: audit-web - 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 imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -19,13 +19,9 @@ spec:
app.kubernetes.io/component: audit app.kubernetes.io/component: audit
spec: spec:
{{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }} {{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: audit - 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 imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
+7 -13
View File
@@ -1,16 +1,13 @@
registry: 192.168.1.105:8888/mixingx global:
tag: latest imageRegistry: ""
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
timezone: Asia/Shanghai
storage: storage:
className: local-path className: local-path
sharedInfra: sharedInfra:
postgres: postgres:
image: docker.io/library/postgres:17
username: postgres username: postgres
password: "Admin12345" password: "Admin12345"
port: 5432 port: 5432
@@ -31,7 +28,6 @@ audit:
ssoBaseUrl: "http://sso-service:8080" ssoBaseUrl: "http://sso-service:8080"
# 中心 Audit Broker(ADR-0048)与 audit 专属 PostgreSQL 随本 chart 发布(ADR-0065) # 中心 Audit Broker(ADR-0048)与 audit 专属 PostgreSQL 随本 chart 发布(ADR-0065)
mqtt: mqtt:
image: "emqx/nanomq:0.25.2-2"
brokerHost: "audit-nanomq-service" brokerHost: "audit-nanomq-service"
brokerPort: 1883 brokerPort: 1883
managementPort: 8081 managementPort: 8081
@@ -45,12 +41,10 @@ audit:
concurrency: 4 concurrency: 4
images: images:
audit: audit: { repository: audit, tag: "" }
repository: audit auditWeb: { repository: audit-web, tag: "" }
tag: "" postgres: { repository: postgres, tag: "17" }
auditWeb: nanomq: { repository: nanomq, tag: "0.25.2-2" }
repository: audit-web
tag: ""
tier: tier:
enabled: false enabled: false
@@ -1,6 +0,0 @@
apiVersion: v2
name: mixingx-codeserver
description: MixingX code-server — 浏览器版 VS Code 测试 IDE,预装 GitLens/EditorConfig/Prettier/C#/OPC UA Browser 插件。
type: application
version: 1.0.55
appVersion: "1.0.55"
@@ -1,12 +0,0 @@
# mixingx-codeserver
浏览器版 VS Code 测试 IDE(code-server),供各环境在浏览器里临时查看/排查代码。
预装插件随镜像(mixingx/codeserver,mxcicd 构建,基镜像 coder/code-server:4.139.1 锁版):
GitLens 19.2.0 / EditorConfig 0.18.2 / Prettier 12.4.0 / C#(muhammad-sammy 分支 2.145.21,linux-x64)/
.NET Runtime 3.2.0 / OPC UA Browser 1.2.4(微软市场 side-load,MIT)。
- 登录:密码认证,密码在各环境 values `codeserver.password`(明文,家规同 postgres/redis)。
- 持久化:工作区 `/home/coder/project` 落 PVC `<name>-data`(`storage.keep=true`,卸载不回收);
插件/设置烧在镜像层(不落盘,升级镜像即整体更新)。
- 入口:traefik ingress(`*.mixingx.local` DNS 环境),无 DNS 现场改 NodePort(参考 mqttx 注释)。
- 注意:单副本 + RWO 盘,Deployment 策略 Recreate;traefik 原生支持 WebSocket,无需额外注解。
@@ -1,13 +0,0 @@
{{/*
组件名(默认 codeserver,可被 values 覆盖)。
*/}}
{{- define "mixingx-codeserver.name" -}}
{{- .Values.codeserver.name | default "codeserver" -}}
{{- end -}}
{{/*
Secret 数据(登录密码);Deployment 用它的 sha256 做滚动重启锚点。
*/}}
{{- define "mixingx-codeserver.secretData" -}}
PASSWORD: {{ .Values.codeserver.password | default "changeme" | quote }}
{{- end -}}
@@ -1,127 +0,0 @@
{{- $root := . }}
{{- $name := include "mixingx-codeserver.name" . }}
---
apiVersion: v1
kind: Secret
metadata:
name: {{ $name }}-secrets
labels:
app.kubernetes.io/name: mixingx
app.kubernetes.io/instance: {{ $root.Release.Name }}
app.kubernetes.io/component: {{ $name }}
type: Opaque
stringData:
{{- include "mixingx-codeserver.secretData" . | nindent 2 }}
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: {{ $name }}-data
{{- if .Values.storage.keep }}
annotations:
helm.sh/resource-policy: keep
{{- end }}
labels:
app.kubernetes.io/name: mixingx
app.kubernetes.io/instance: {{ $root.Release.Name }}
app.kubernetes.io/component: {{ $name }}
spec:
accessModes:
- ReadWriteOnce
storageClassName: {{ .Values.storage.className | default "local-path" }}
resources:
requests:
storage: {{ .Values.storage.size | default "5Gi" }}
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ $name }}-deployment
labels:
app.kubernetes.io/name: mixingx
app.kubernetes.io/instance: {{ $root.Release.Name }}
app.kubernetes.io/component: {{ $name }}
spec:
# RWO 工作区数据盘 + 单副本:滚动更新会新旧 Pod 争盘,必须 Recreate
strategy:
type: Recreate
replicas: {{ .Values.codeserver.replicas | default 1 }}
selector:
matchLabels:
app.kubernetes.io/component: {{ $name }}
template:
metadata:
labels:
app.kubernetes.io/component: {{ $name }}
annotations:
# 密码变更 → 校验和变化 → 滚动重启生效
checksum/secret: {{ include "mixingx-codeserver.secretData" . | sha256sum }}
spec:
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
securityContext:
# 镜像内置用户 coder(uid/gid 1000);fsGroup 使 local-path 数据盘归属 coder
runAsUser: 1000
runAsGroup: 1000
fsGroup: 1000
containers:
- name: {{ $name }}
image: "{{ .Values.codeserver.image.repository }}:{{ .Values.codeserver.image.tag | default "latest" }}"
imagePullPolicy: IfNotPresent
args:
- --auth=password
- --bind-addr=0.0.0.0:8080
- /home/coder/project
ports:
- name: http
containerPort: 8080
protocol: TCP
env:
- name: TZ
value: "{{ $root.Values.timezone | default "Asia/Shanghai" }}"
envFrom:
- secretRef:
name: {{ $name }}-secrets
volumeMounts:
- name: data
mountPath: /home/coder/project
resources:
{{- toYaml .Values.resources | nindent 12 }}
# code-server 未认证 GET / 返回 302(跳登录页),httpGet 判活有歧义,统一 TCP 探针
livenessProbe:
tcpSocket:
port: http
initialDelaySeconds: 15
periodSeconds: 30
readinessProbe:
tcpSocket:
port: http
initialDelaySeconds: 5
periodSeconds: 10
volumes:
- name: data
persistentVolumeClaim:
claimName: {{ $name }}-data
---
apiVersion: v1
kind: Service
metadata:
name: {{ $name }}-service
labels:
app.kubernetes.io/name: mixingx
app.kubernetes.io/component: {{ $name }}
mixingx.io/role: codeserver
mixingx.io/node-id: {{ $name }}
annotations:
mixingx.io/description: {{ .Values.codeserver.description | quote }}
spec:
type: ClusterIP
selector:
app.kubernetes.io/component: {{ $name }}
ports:
- name: http
port: 80
targetPort: http
protocol: TCP
@@ -1,25 +0,0 @@
{{- $name := include "mixingx-codeserver.name" . }}
{{- if .Values.ingress.enabled }}
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ $name }}-ingress
annotations:
{{- range $k, $v := .Values.ingress.annotations }}
{{ $k }}: {{ $v | quote }}
{{- end }}
spec:
ingressClassName: {{ .Values.ingress.className }}
rules:
- host: {{ .Values.ingress.host }}
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: {{ $name }}-service
port:
number: 80
{{- end }}
@@ -1,40 +0,0 @@
# code-server(web VS Code)测试版:预装插件随镜像(GitLens/EditorConfig/Prettier/C# 分支/OPC UA Browser)。
# 用途:各环境浏览器内 IDE,临时查看/排查代码;不是开发主力环境。
# 镜像:mixingx/codeserver(mxcicd 构建,基镜像 coder/code-server:4.139.1 锁版,不走 image-version.yaml 的 images 机制)。
# 密码:values 明文(家规同 postgres/redis);登录 http://<ingress host>。
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-66 编号见各仓引用);内网留空=匿名拉取,行为不变
imagePullSecrets: []
codeserver:
name: codeserver
replicas: 1
image:
repository: 192.168.1.119:8888/mixingx/codeserver
tag: v0.1.0
description: "浏览器版 VS Code(测试)"
# 登录密码(各环境 values 必须覆盖;changeme 仅保证 helm template 默认值可渲染)
password: "changeme"
storage:
# 工作区(/home/coder/project)数据盘;keep=true 时 helm uninstall/down 不回收
className: local-path
size: 5Gi
keep: true
resources:
requests:
memory: 512Mi
cpu: 200m
limits:
memory: 2Gi
cpu: "2"
ingress:
enabled: true
className: traefik
host: codeserver.mixingx.local
annotations:
traefik.ingress.kubernetes.io/router.entrypoints: web
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-edge-unit name: mixingx-edge-unit
description: "One MixingX edge unit release with durable local revision storage." description: "One MixingX edge unit release with durable local revision storage."
type: application type: application
version: 1.0.55 version: 0.1.0
appVersion: "1.0.55" appVersion: "1.0.1"
@@ -43,6 +43,13 @@ AuditMqttPublisher__NodeId: "{{ .Values.audit.publisher.nodeId | default $name }
{{- printf "/%s-%s" .Values.role (.Values.site | toString) -}} {{- printf "/%s-%s" .Values.role (.Values.site | toString) -}}
{{- end -}} {{- 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" -}} {{- define "mixingx-unit.storageClassName" -}}
{{- .Values.storage.className | default "local-path" -}} {{- .Values.storage.className | default "local-path" -}}
{{- end -}} {{- end -}}
@@ -23,13 +23,9 @@ spec:
app.kubernetes.io/component: {{ $brokerName }} app.kubernetes.io/component: {{ $brokerName }}
spec: spec:
{{ include "mixingx-unit.backendScheduling" . | nindent 6 }} {{ include "mixingx-unit.backendScheduling" . | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: nanomq - 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 imagePullPolicy: IfNotPresent
ports: ports:
- name: mqtt - name: mqtt
@@ -55,17 +55,9 @@ spec:
secret: secret:
secretName: {{ required "edgeSecrets.mounts[].secretName is required" $secret.secretName | quote }} secretName: {{ required "edgeSecrets.mounts[].secretName is required" $secret.secretName | quote }}
{{- end }} {{- end }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ $name }} - name: {{ $name }}
{{ $backendImg := .Values.images.backend }} image: {{ include "mixingx-edge-unit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.edge) | quote }}
{{ $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 }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -171,17 +163,9 @@ spec:
app.kubernetes.io/component: {{ $webName }} app.kubernetes.io/component: {{ $webName }}
spec: spec:
{{ include "mixingx-unit.followerScheduling" . | nindent 6 }} {{ include "mixingx-unit.followerScheduling" . | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ $webName }} - name: {{ $webName }}
{{ $frontendImg := .Values.images.frontend }} image: {{ include "mixingx-edge-unit.image" (dict "registry" .Values.global.imageRegistry "image" .Values.images.edgeWeb) | quote }}
{{ $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 }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
+6 -16
View File
@@ -1,9 +1,7 @@
registry: 192.168.1.105:8888/mixingx global:
tag: latest imageRegistry: ""
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
timezone: Asia/Shanghai
role: edge role: edge
site: "0" site: "0"
@@ -12,14 +10,9 @@ serviceId: ""
idWorkerId: 17 idWorkerId: 17
images: images:
backend: edge: { repository: edge, tag: "" }
repository: edge edgeWeb: { repository: edge-web, tag: "" }
tag: "" nanomq: { repository: nanomq, tag: "0.25.2-2" }
frontend:
repository: edge-web
tag: ""
edge: {}
edgeWeb: {}
ports: ports:
backend: 8080 backend: 8080
@@ -65,9 +58,6 @@ sharedInfra:
mqtt: mqtt:
enabled: true enabled: true
image:
repository: emqx/nanomq
tag: 0.25.2-2
port: 1883 port: 1883
wsPort: 8083 # WebSocket listener(NanoMQ 镜像默认开启,路径 /mqtt),供 MQTTX Web 连接 wsPort: 8083 # WebSocket listener(NanoMQ 镜像默认开启,路径 /mqtt),供 MQTTX Web 连接
credentialRef: "" # 默认空,模板内 default 为 {name}-mqtt credentialRef: "" # 默认空,模板内 default 为 {name}-mqtt
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-gateway name: mixingx-gateway
description: MixingX gateway service, RBAC, and root ingress. description: MixingX gateway service, RBAC, and root ingress.
type: application type: application
version: 1.0.55 version: 0.1.0
appVersion: "1.0.55" appVersion: "1.0.1"
@@ -2,6 +2,13 @@
{{- .Values.storage.className | default "local-path" -}} {{- .Values.storage.className | default "local-path" -}}
{{- end -}} {{- 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" -}} {{- define "mixingx-gateway.tierAffinity" -}}
{{- $root := .root -}} {{- $root := .root -}}
{{- $role := .role -}} {{- $role := .role -}}
@@ -26,13 +26,9 @@ spec:
serviceAccountName: gateway-sa serviceAccountName: gateway-sa
{{- end }} {{- end }}
{{ include "mixingx-gateway.tierAffinity" (dict "role" "gateway" "root" $) | nindent 6 }} {{ include "mixingx-gateway.tierAffinity" (dict "role" "gateway" "root" $) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: gateway - 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 imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -9,9 +9,7 @@ metadata:
spec: spec:
ingressClassName: traefik ingressClassName: traefik
rules: rules:
- {{- if .Values.ingress.domain }} - host: {{ .Values.ingress.domain }}
host: {{ .Values.ingress.domain }}
{{- end }}
http: http:
paths: paths:
- path: / - path: /
+3 -6
View File
@@ -1,9 +1,7 @@
registry: 192.168.1.119:8888/mixingx global:
tag: latest imageRegistry: ""
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
timezone: Asia/Shanghai
storage: storage:
className: local-path className: local-path
@@ -34,7 +32,6 @@ gateway:
ingress: ingress:
enabled: true enabled: true
# domain 留空 = 渲染不带 host 的规则,现场 PC 可直接用节点 IP 访问(如 http://192.168.137.117/)
domain: app.mixingx.local domain: app.mixingx.local
gatewayService: gateway-service gatewayService: gateway-service
gatewayPort: 8080 gatewayPort: 8080
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-infra name: mixingx-infra
description: MixingX shared infrastructure services (Redis, MongoDB, RabbitMQ). description: MixingX shared infrastructure services (Redis, MongoDB, RabbitMQ).
type: application type: application
version: 1.0.55 version: 0.1.0
appVersion: "1.0.55" appVersion: "1.0.1"
@@ -2,6 +2,13 @@
{{- .Values.storage.className | default "local-path" -}} {{- .Values.storage.className | default "local-path" -}}
{{- end -}} {{- 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" -}} {{- define "mixingx-infra.tierAffinity" -}}
{{- $root := .root -}} {{- $root := .root -}}
{{- $role := .role -}} {{- $role := .role -}}
@@ -31,13 +31,10 @@ spec:
app.kubernetes.io/component: {{ .name }} app.kubernetes.io/component: {{ .name }}
spec: spec:
{{ include "mixingx-infra.tierAffinity" (dict "role" "sharedDatastores" "root" $root) | nindent 6 }} {{ include "mixingx-infra.tierAffinity" (dict "role" "sharedDatastores" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ .name }} - 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 imagePullPolicy: IfNotPresent
ports: ports:
- name: tcp - name: tcp
+12 -9
View File
@@ -1,16 +1,13 @@
registry: 192.168.1.105:8888/mixingx global:
tag: latest imageRegistry: ""
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
timezone: Asia/Shanghai
storage: storage:
className: local-path className: local-path
sharedInfra: sharedInfra:
postgres: postgres:
image: docker.io/library/postgres:17
username: postgres username: postgres
password: "Admin12345" password: "Admin12345"
port: 5432 port: 5432
@@ -39,19 +36,25 @@ tier:
services: services:
sharedDatastores: { mode: required, tiers: [infra] } 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: sharedDatastores:
- name: redis - name: redis
image: docker.io/library/redis:8.6 image: redis
port: 6379 port: 6379
storage: 2Gi storage: 2Gi
mountPath: /data mountPath: /data
- name: mongo - name: mongo
image: docker.io/library/mongo:8.3 image: mongo
port: 27017 port: 27017
storage: 5Gi storage: 5Gi
mountPath: /data/db mountPath: /data/db
- name: messaging - name: messaging
image: docker.io/library/rabbitmq:4.3-management image: rabbitmq
port: 5672 port: 5672
storage: 2Gi storage: 2Gi
mountPath: /var/lib/rabbitmq mountPath: /var/lib/rabbitmq
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-mqttx name: mixingx-mqttx
description: MixingX MQTTX Web — 浏览器端 MQTT 客户端,用于监控/调试各 Edge 的 NanoMQ broker。 description: MixingX MQTTX Web — 浏览器端 MQTT 客户端,用于监控/调试各 Edge 的 NanoMQ broker。
type: application type: application
version: 1.0.55 version: 0.1.0
appVersion: "1.0.55" appVersion: "1.0.1"
@@ -4,3 +4,10 @@
{{- define "mixingx-mqttx.name" -}} {{- define "mixingx-mqttx.name" -}}
{{- .Values.mqttx.name | default "mqttx" -}} {{- .Values.mqttx.name | default "mqttx" -}}
{{- end -}} {{- 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: labels:
app.kubernetes.io/component: {{ $name }} app.kubernetes.io/component: {{ $name }}
spec: spec:
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ $name }} - 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 imagePullPolicy: IfNotPresent
# emqx/mqttx-web 镜像默认 http-server 未显式绑 0.0.0.0,导致只听 loopback、 # emqx/mqttx-web 镜像默认 http-server 未显式绑 0.0.0.0,导致只听 loopback、
# Service/Pod IP 进不来。显式覆盖启动参数,强制监听所有接口。 # Service/Pod IP 进不来。显式覆盖启动参数,强制监听所有接口。
+5 -5
View File
@@ -9,17 +9,17 @@
# #
# Ingress:demo 环境有 *.mixingx.local DNS,用 host 暴露;无 DNS 的现场改用 NodePort。 # Ingress:demo 环境有 *.mixingx.local DNS,用 host 暴露;无 DNS 的现场改用 NodePort。
timezone: Asia/Shanghai global:
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变 imageRegistry: ""
imagePullSecrets: []
timezone: Asia/Shanghai
mqttx: mqttx:
name: mqttx name: mqttx
replicas: 1 replicas: 1
image: image:
repository: emqx/mqttx-web repository: mqttx-web
tag: latest tag: ""
description: "MQTT 监控客户端" description: "MQTT 监控客户端"
ingress: ingress:
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-network-agent name: mixingx-network-agent
description: "MixingX network console agent: 每节点常驻,提供主机网口(IP/掩码/网关/DNS)与 WiFi 的可视化配置 API。" description: "MixingX network console agent: 每节点常驻,提供主机网口(IP/掩码/网关/DNS)与 WiFi 的可视化配置 API。"
type: application type: application
version: 1.0.55 version: 0.1.0
appVersion: "1.0.55" appVersion: "1.0.1"
@@ -28,10 +28,6 @@ spec:
{{- else if .Values.nodeSelector }} {{- else if .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }} {{ toYaml .Values.nodeSelector | indent 8 }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
containers: containers:
- name: network-agent - name: network-agent
@@ -55,10 +51,13 @@ spec:
- name: K3S_RESTART_ON_IP_CHANGE - name: K3S_RESTART_ON_IP_CHANGE
value: {{ .Values.k3sRestartOnIpChange | quote }} value: {{ .Values.k3sRestartOnIpChange | quote }}
securityContext: securityContext:
# 只需 root + D-Bus socket,无需 privileged 与额外 capability: # 只需 root + D-Bus socket,无需 privileged
# nmcli 经 D-Bus 操作主机 NM,特权动作(改 IP/路由)全部由 NM 进程执行 # NET_ADMIN: 清除切换静态后残留的动态地址(ip addr del 需要此能力)
runAsUser: 0 runAsUser: 0
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
capabilities:
add:
- NET_ADMIN
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /api/network/health path: /api/network/health
@@ -81,15 +80,15 @@ spec:
# 主机 system bus: nmcli 与 systemd 重启都走它 # 主机 system bus: nmcli 与 systemd 重启都走它
- name: dbus - name: dbus
mountPath: /run/dbus/system_bus_socket mountPath: /run/dbus/system_bus_socket
# 网卡别名持久化: aliases.json 落宿主机,重启/重建 Pod 均保留 - name: nm-run
- name: alias-store mountPath: /run/NetworkManager
mountPath: /var/lib/mixingx/network-agent readOnly: true
volumes: volumes:
- name: dbus - name: dbus
hostPath: hostPath:
path: /run/dbus/system_bus_socket path: /run/dbus/system_bus_socket
type: Socket type: Socket
- name: alias-store - name: nm-run
hostPath: hostPath:
path: /var/lib/mixingx/network-agent path: /run/NetworkManager
type: DirectoryOrCreate type: DirectoryOrCreate
@@ -1,8 +1,6 @@
# Headless 诊断服务: DNS network-agent 返回各节点 agent 的全部地址。 # Headless 诊断服务: DNS network-agent 返回各节点 agent 的全部地址。
# 注意: 每个 agent 只管理自己所在节点,不要用普通 ClusterIP Service 访问 # 注意: 每个 agent 只管理自己所在节点,不要用普通 ClusterIP Service 访问
# (会在节点间随机负载均衡导致操作到错误的主机)。前端弹窗始终直连节点 IP。 # (会在节点间随机负载均衡导致操作到错误的主机)。前端弹窗始终直连节点 IP。
# mixingx.io/role 标签让 Gateway 发现该服务并生成 /api/network/** 透传路由,
# 前端网络设置弹窗经 Gateway 同源转发访问(消除跨域)。
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
@@ -10,8 +8,6 @@ metadata:
labels: labels:
app.kubernetes.io/name: mixingx app.kubernetes.io/name: mixingx
app.kubernetes.io/component: network-agent app.kubernetes.io/component: network-agent
mixingx.io/role: network-agent
mixingx.io/node-id: network-agent
spec: spec:
clusterIP: None clusterIP: None
selector: selector:
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-platform name: mixingx-platform
description: MixingX central platform services without customer edge/agent instances. description: MixingX central platform services without customer edge/agent instances.
type: application type: application
version: 1.0.55 version: 0.1.0
appVersion: "1.0.55" appVersion: "1.0.1"
@@ -2,6 +2,13 @@
{{- .Values.storage.className | default "local-path" -}} {{- .Values.storage.className | default "local-path" -}}
{{- end -}} {{- 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" -}} {{- define "mixingx-platform.tierAffinity" -}}
{{- $root := .root -}} {{- $root := .root -}}
{{- $role := .role -}} {{- $role := .role -}}
@@ -25,13 +25,10 @@ spec:
serviceAccountName: gateway-sa serviceAccountName: gateway-sa
{{- end }} {{- end }}
{{ include "mixingx-platform.tierAffinity" (dict "role" .role "root" $root) | nindent 6 }} {{ include "mixingx-platform.tierAffinity" (dict "role" .role "root" $root) | nindent 6 }}
{{- with $root.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ .name }} - 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 imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -160,13 +157,10 @@ spec:
app.kubernetes.io/component: {{ .name }} app.kubernetes.io/component: {{ .name }}
spec: spec:
{{ include "mixingx-platform.tierAffinity" (dict "role" .tierRole "root" $root) | nindent 6 }} {{ include "mixingx-platform.tierAffinity" (dict "role" .tierRole "root" $root) | nindent 6 }}
{{- with $root.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ .name }} - 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 imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -232,13 +226,9 @@ spec:
app.kubernetes.io/component: {{ .name }}-postgres app.kubernetes.io/component: {{ .name }}-postgres
spec: spec:
{{ include "mixingx-platform.tierAffinity" (dict "role" .tierRole "root" $root) | nindent 6 }} {{ include "mixingx-platform.tierAffinity" (dict "role" .tierRole "root" $root) | nindent 6 }}
{{- with $root.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: postgres - 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 imagePullPolicy: IfNotPresent
env: env:
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
@@ -20,13 +20,10 @@ spec:
app.kubernetes.io/component: audit app.kubernetes.io/component: audit
spec: spec:
{{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }} {{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: audit - 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 imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -145,13 +142,10 @@ spec:
app.kubernetes.io/component: {{ .Values.audit.webName }} app.kubernetes.io/component: {{ .Values.audit.webName }}
spec: spec:
{{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }} {{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ .Values.audit.webName }} - 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 imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -214,13 +208,9 @@ spec:
app.kubernetes.io/component: {{ .Values.audit.database }}-postgres app.kubernetes.io/component: {{ .Values.audit.database }}-postgres
spec: spec:
{{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }} {{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: postgres - 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 imagePullPolicy: IfNotPresent
env: env:
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
@@ -31,13 +31,10 @@ spec:
app.kubernetes.io/component: {{ .name }} app.kubernetes.io/component: {{ .name }}
spec: spec:
{{ include "mixingx-platform.tierAffinity" (dict "role" "sharedDatastores" "root" $root) | nindent 6 }} {{ include "mixingx-platform.tierAffinity" (dict "role" "sharedDatastores" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ .name }} - 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 imagePullPolicy: IfNotPresent
ports: ports:
- name: tcp - name: tcp
+24 -13
View File
@@ -1,16 +1,13 @@
registry: 192.168.1.105:8888/mixingx global:
tag: latest imageRegistry: ""
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
timezone: Asia/Shanghai
storage: storage:
className: local-path className: local-path
sharedInfra: sharedInfra:
postgres: postgres:
image: docker.io/library/postgres:17
username: postgres username: postgres
password: "Admin12345" password: "Admin12345"
port: 5432 port: 5432
@@ -43,12 +40,26 @@ tier:
audit: { mode: required, tiers: [infra] } audit: { mode: required, tiers: [infra] }
sharedDatastores: { 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: standalones:
- name: sso - name: sso
image: sso image: sso
role: sso role: sso
webName: sso-web webName: sso-web
webImage: sso-web webImage: ssoWeb
webBasePath: /sso/ webBasePath: /sso/
serviceId: sso serviceId: sso
database: sso-db database: sso-db
@@ -60,7 +71,7 @@ standalones:
image: ultra image: ultra
role: ultra role: ultra
webName: ultra-web webName: ultra-web
webImage: ultra-web webImage: ultraWeb
webBasePath: /ultra/ webBasePath: /ultra/
serviceId: ultra serviceId: ultra
database: ultra-db database: ultra-db
@@ -80,7 +91,7 @@ audit:
port: 5900 port: 5900
replicas: 2 replicas: 2
webName: audit-web webName: audit-web
webImage: audit-web webImage: auditWeb
webBasePath: /audit/ webBasePath: /audit/
webPort: 8900 webPort: 8900
database: audit-db database: audit-db
@@ -99,22 +110,22 @@ audit:
sharedDatastores: sharedDatastores:
- name: redis - name: redis
image: docker.io/library/redis:8.6 image: redis
port: 6379 port: 6379
storage: 2Gi storage: 2Gi
mountPath: /data mountPath: /data
- name: mongo - name: mongo
image: docker.io/library/mongo:8.3 image: mongo
port: 27017 port: 27017
storage: 5Gi storage: 5Gi
mountPath: /data/db mountPath: /data/db
- name: messaging - name: messaging
image: docker.io/library/rabbitmq:4.3-management image: rabbitmq
port: 5672 port: 5672
storage: 2Gi storage: 2Gi
mountPath: /var/lib/rabbitmq mountPath: /var/lib/rabbitmq
- name: audit-nanomq - name: audit-nanomq
image: emqx/nanomq:0.25.2-2 image: nanomq
port: 1883 port: 1883
storage: 1Gi storage: 1Gi
mountPath: /var/lib/nanomq mountPath: /var/lib/nanomq
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-protocol-server-unit name: mixingx-protocol-server-unit
description: Deploy one MixingX edge protocol test server instance. description: Deploy one MixingX edge protocol test server instance.
type: application type: application
version: 1.0.55 version: 0.1.0
appVersion: "1.0.55" 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 }} {{ toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- $proto := index .Values.images.protocol .Values.type }} {{- $proto := index .Values.images.protocol .Values.type }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: protocol-server - 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 }} imagePullPolicy: {{ .Values.imagePullPolicy }}
args: args:
- "--port" - "--port"
@@ -1,9 +1,7 @@
registry: 192.168.1.105:8888/mixingx global:
tag: latest imageRegistry: ""
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
timezone: Asia/Shanghai
# Legacy image override (kept for backward compatibility). # Legacy image override (kept for backward compatibility).
type: opcua type: opcua
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-sso name: mixingx-sso
description: MixingX SSO standalone release (backend, web, and PostgreSQL). description: MixingX SSO standalone release (backend, web, and PostgreSQL).
type: application type: application
version: 1.0.55 version: 0.1.0
appVersion: "1.0.55" appVersion: "1.0.1"
@@ -2,6 +2,13 @@
{{- .Values.storage.className | default "local-path" -}} {{- .Values.storage.className | default "local-path" -}}
{{- end -}} {{- 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" -}} {{- define "mixingx-sso.configData" -}}
{{- $root := . -}} {{- $root := . -}}
{{- $name := $root.Values.sso.name -}} {{- $name := $root.Values.sso.name -}}
+3 -15
View File
@@ -28,13 +28,9 @@ spec:
app.kubernetes.io/component: {{ $name }} app.kubernetes.io/component: {{ $name }}
spec: spec:
{{ include "mixingx-sso.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }} {{ include "mixingx-sso.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ $name }} - 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 imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -130,13 +126,9 @@ spec:
app.kubernetes.io/component: {{ $webName }} app.kubernetes.io/component: {{ $webName }}
spec: spec:
{{ include "mixingx-sso.tierAffinity" (dict "role" "web" "root" $root) | nindent 6 }} {{ include "mixingx-sso.tierAffinity" (dict "role" "web" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ $webName }} - 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 imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -198,13 +190,9 @@ spec:
app.kubernetes.io/component: {{ $name }}-postgres app.kubernetes.io/component: {{ $name }}-postgres
spec: spec:
{{ include "mixingx-sso.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }} {{ include "mixingx-sso.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: postgres - 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 imagePullPolicy: IfNotPresent
env: env:
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
+6 -12
View File
@@ -1,16 +1,13 @@
registry: 192.168.1.105:8888/mixingx global:
tag: latest imageRegistry: ""
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
timezone: Asia/Shanghai
storage: storage:
className: local-path className: local-path
sharedInfra: sharedInfra:
postgres: postgres:
image: docker.io/library/postgres:17
username: postgres username: postgres
password: "Admin12345" password: "Admin12345"
port: 5432 port: 5432
@@ -45,9 +42,6 @@ audit:
brokerUrl: "mqtt://audit-nanomq-service:1883" brokerUrl: "mqtt://audit-nanomq-service:1883"
images: images:
sso: sso: { repository: sso, tag: "" }
repository: sso ssoWeb: { repository: sso-web, tag: "" }
tag: "" postgres: { repository: postgres, tag: "17" }
ssoWeb:
repository: sso-web
tag: ""
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-ultra name: mixingx-ultra
description: "MixingX Ultra dashboard standalone release: ultra backend, ultra web, and ultra PostgreSQL." description: "MixingX Ultra dashboard standalone release: ultra backend, ultra web, and ultra PostgreSQL."
type: application type: application
version: 1.0.55 version: 0.1.0
appVersion: "1.0.55" appVersion: "1.0.1"
@@ -2,6 +2,13 @@
{{- .Values.storage.className | default "local-path" -}} {{- .Values.storage.className | default "local-path" -}}
{{- end -}} {{- 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" -}} {{- define "mixingx-ultra.configData" -}}
{{- $root := . -}} {{- $root := . -}}
{{- $cfg := $root.Values.ultra -}} {{- $cfg := $root.Values.ultra -}}
@@ -33,13 +33,9 @@ spec:
app.kubernetes.io/component: {{ $name }} app.kubernetes.io/component: {{ $name }}
spec: spec:
{{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }} {{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ $name }} - 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 imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -133,13 +129,9 @@ spec:
app.kubernetes.io/component: {{ $name }}-web app.kubernetes.io/component: {{ $name }}-web
spec: spec:
{{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }} {{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ $name }}-web - 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 imagePullPolicy: IfNotPresent
ports: ports:
- name: http - name: http
@@ -201,13 +193,9 @@ spec:
app.kubernetes.io/component: {{ $name }}-postgres app.kubernetes.io/component: {{ $name }}-postgres
spec: spec:
{{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }} {{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: postgres - 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 imagePullPolicy: IfNotPresent
env: env:
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
+6 -12
View File
@@ -1,16 +1,13 @@
registry: 192.168.1.105:8888/mixingx global:
tag: latest imageRegistry: ""
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
timezone: Asia/Shanghai
storage: storage:
className: local-path className: local-path
sharedInfra: sharedInfra:
postgres: postgres:
image: docker.io/library/postgres:17
username: postgres username: postgres
password: "Admin12345" password: "Admin12345"
port: 5432 port: 5432
@@ -28,12 +25,9 @@ sharedInfra:
protocol: grpc protocol: grpc
images: images:
ultra: ultra: { repository: ultra, tag: "" }
repository: ultra ultraWeb: { repository: ultra-web, tag: "" }
tag: "" postgres: { repository: postgres, tag: "17" }
ultraWeb:
repository: ultra-web
tag: ""
ultra: ultra:
name: ultra name: ultra
+112
View File
@@ -0,0 +1,112 @@
#!/usr/bin/env bash
# ============================================================================
# provision-host.sh — MixingX network-agent 主机初始化 (Ubuntu Server 20.04+)
#
# 职责(幂等,可重复执行):
# 1. 安装并启动 NetworkManager(服务器版默认未装)
# 2. 读取主网口当前网络参数,预创建等值静态 NM 连接(切换前后地址不变,不断网)
# 3. 创建低优先级 DHCP 救援连接(静态配错时的主机侧兜底)
# 4. 禁用 cloud-init 网络管理,netplan renderer 切换为 NetworkManager
# 5. rfkill 解锁无线网卡
# 6. 安装 polkit 放行规则(容器内 root 调用 NM/systemd D-Bus)
#
# 用法: sudo bash provision-host.sh
# 回滚: sudo bash rollback-host.sh
# 备份: /var/backups/mixingx-netconsole/
# ============================================================================
set -euo pipefail
BACKUP_DIR=/var/backups/mixingx-netconsole
log() { echo -e "\033[32m[mixingx]\033[0m $*"; }
die() { echo -e "\033[31m[mixingx] 错误: $*\033[0m" >&2; exit 1; }
[[ $EUID -eq 0 ]] || die "请用 root 运行: sudo bash $0"
command -v ip >/dev/null 2>&1 || die "缺少 ip 命令"
mkdir -p "$BACKUP_DIR"
# ── 1. 安装 NetworkManager ────────────────────────────────────────────────
if ! command -v nmcli >/dev/null 2>&1; then
log "安装 NetworkManager ..."
export DEBIAN_FRONTEND=noninteractive
apt-get update -qq
apt-get install -y -qq network-manager
fi
# 关闭 NM 自动建连(未配置网卡自动 DHCP),避免与现有 networkd 抢接口
mkdir -p /etc/NetworkManager/conf.d
cat > /etc/NetworkManager/conf.d/99-mixingx.conf <<'EOF'
[main]
no-auto-default=*
EOF
systemctl enable --now NetworkManager >/dev/null 2>&1 || true
# ── 2. 识别主网口并读取当前参数 ───────────────────────────────────────────
PRIMARY_IF=$(ip -4 route show default | awk '{print $5; exit}')
[[ -n "${PRIMARY_IF:-}" ]] || die "未找到默认路由网卡(主机当前无网络?)"
PRIMARY_TYPE=$(ip link show "$PRIMARY_IF" | grep -o 'link/[a-z]*' | head -1)
CUR_ADDR=$(ip -4 addr show dev "$PRIMARY_IF" | awk '/inet /{print $2; exit}') # x.x.x.x/前缀
CUR_GW=$(ip -4 route show default | awk '{print $3; exit}')
CUR_DNS4=$(grep -h '^nameserver' /run/systemd/resolve/resolv.conf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf 2>/dev/null \
| awk '{print $2}' | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' | sort -u | tr '\n' ' ')
log "主网口 $PRIMARY_IF 当前: 地址=$CUR_ADDR 网关=$CUR_GW DNS4=${CUR_DNS4:-<无>}"
# ── 3. 救援连接(仅以太网主口;WiFi 主口跳过——救援 DHCP 对 WiFi 无意义) ────
if [[ "$PRIMARY_TYPE" == "ethernet"* ]]; then
if ! nmcli connection show "rescue-dhcp" >/dev/null 2>&1; then
log "创建救援 DHCP 连接 rescue-dhcp (autoconnect-priority -100)"
nmcli connection add type ethernet ifname "$PRIMARY_IF" con-name "rescue-dhcp" \
ipv4.method auto \
connection.autoconnect yes \
connection.autoconnect-priority -100 >/dev/null
fi
fi
# ── 4. 全局切换 netplan renderer → NetworkManager ────────────────────────
# 不删除原 netplan 配置(ethernet/wifi 定义、SSID/PSK 原样保留),
# netplan 会把原有连接定义自动渲染为等值的 NM profiles,无缝接管
if [[ ! -f /etc/netplan/90-mixingx-nm.yaml ]]; then
log "备份原 netplan 配置 → $BACKUP_DIR/netplan/"
mkdir -p "$BACKUP_DIR/netplan"
cp -a /etc/netplan/*.yaml "$BACKUP_DIR/netplan/" 2>/dev/null || true
log "禁用 cloud-init 网络管理"
mkdir -p /etc/cloud/cloud.cfg.d
echo "network: {config: disabled}" > /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg
log "写入全局 renderer=NetworkManager"
cat > /etc/netplan/90-mixingx-nm.yaml <<'EOF'
network:
version: 2
renderer: NetworkManager
EOF
chmod 600 /etc/netplan/90-mixingx-nm.yaml
fi
log "应用 netplan (交给 NetworkManager 托管)..."
netplan apply
# ── 5. 无线解锁 + polkit 放行 ─────────────────────────────────────────────
rfkill unblock all 2>/dev/null || true
if command -v pkexec >/dev/null 2>&1 || dpkg -s policykit-1 >/dev/null 2>&1; then
mkdir -p /etc/polkit-1/localauthority/50-local.d
cat > /etc/polkit-1/localauthority/50-local.d/49-mixingx-network-agent.pkla <<'EOF'
[MixingX Network Agent]
Identity=unix-user:root
Action=org.freedesktop.NetworkManager.*;org.freedesktop.systemd1.*
ResultAny=yes
ResultInactive=yes
ResultActive=yes
EOF
fi
# ── 6. 校验 ───────────────────────────────────────────────────────────────
sleep 3
log "当前设备状态:"
nmcli -g DEVICE,TYPE,STATE,CONNECTION device status
log "主网口地址: $(ip -4 addr show dev "$PRIMARY_IF" | awk '/inet /{print $2}')"
log "完成。后续用 k3s 弹窗或 nmcli 管理;回滚执行 rollback-host.sh"
+48
View File
@@ -0,0 +1,48 @@
#!/usr/bin/env bash
# ============================================================================
# rollback-host.sh — provision-host.sh 的反向操作
#
# 职责:
# 1. 恢复原 netplan 配置(从 /var/backups/mixingx-netconsole/netplan/)
# 2. 恢复 cloud-init 网络管理
# 3. 停用 NetworkManager 托管(服务禁用,连接配置保留)
# 4. 移除 polkit 放行规则
#
# 用法: sudo bash rollback-host.sh
# ============================================================================
set -euo pipefail
BACKUP_DIR=/var/backups/mixingx-netconsole
log() { echo -e "\033[32m[mixingx]\033[0m $*"; }
die() { echo -e "\033[31m[mixingx] 错误: $*\033[0m" >&2; exit 1; }
[[ $EUID -eq 0 ]] || die "请用 root 运行: sudo bash $0"
# ── 1. 恢复 netplan ───────────────────────────────────────────────────────
if [[ -d "$BACKUP_DIR/netplan" ]] && ls "$BACKUP_DIR/netplan"/*.yaml >/dev/null 2>&1; then
log "恢复备份的 netplan 配置"
rm -f /etc/netplan/90-mixingx-nm.yaml
cp -a "$BACKUP_DIR/netplan"/*.yaml /etc/netplan/
else
log "无备份,仅移除 NM renderer 配置(回退到 renderer 默认)"
rm -f /etc/netplan/90-mixingx-nm.yaml
fi
# ── 2. 恢复 cloud-init 网络管理 ───────────────────────────────────────────
rm -f /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg
log "应用恢复的 netplan ..."
netplan apply
# ── 3. 停用 NetworkManager ────────────────────────────────────────────────
log "停用并禁用 NetworkManager"
systemctl disable --now NetworkManager >/dev/null 2>&1 || true
# ── 4. 移除 polkit 规则 / NM 覆盖配置 ─────────────────────────────────────
rm -f /etc/polkit-1/localauthority/50-local.d/49-mixingx-network-agent.pkla
rm -f /etc/NetworkManager/conf.d/99-mixingx.conf
sleep 3
ip -4 addr show | awk '/inet /{print " " $2 " @ " $NF}'
log "回滚完成。NM 连接配置保留在 /etc/NetworkManager/system-connections/ (可手工清理)"