Compare commits
25
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
322411955e | ||
|
|
4716a40c3a | ||
|
|
9ab9b5c97e | ||
|
|
6707dbe28f | ||
|
|
8b70d43953 | ||
|
|
70c85011db | ||
|
|
34e108dbbc | ||
|
|
4395e900e9 | ||
|
|
0aea949b49 | ||
|
|
798735a0a8 | ||
|
|
5e9b92f507 | ||
|
|
b21fb1ac92 | ||
|
|
f2e6683a44 | ||
|
|
c4f962d120 | ||
|
|
352aa78a8f | ||
|
|
e5f1ba44c8 | ||
|
|
4e517797e1 | ||
|
|
5bc1b52721 | ||
|
|
90d8838e15 | ||
|
|
2e7d079f65 | ||
|
|
a567579ab2 | ||
|
|
3433a6d945 | ||
|
|
befbfee653 | ||
|
|
07f22f5eb4 | ||
|
|
601151bfae |
No files matched your search
@@ -0,0 +1,23 @@
|
|||||||
|
# 交付镜像清单(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
|
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: 0.1.1
|
version: 1.0.14
|
||||||
appVersion: "1.0.1"
|
appVersion: "1.0.14"
|
||||||
@@ -6,12 +6,11 @@ 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
|
||||||
|
|
||||||
The release requires a pre-created PostgreSQL credentials Secret. By default its
|
Agent PostgreSQL sessions set `idle_in_transaction_session_timeout` through the
|
||||||
name is `agent-<site>-postgres-credentials`; the required keys are
|
connection string. The default is `60s`, configurable with
|
||||||
`admin-password`, `app-password`, and `connection-string`. The Agent connection
|
`sharedInfra.postgres.idleInTransactionSessionTimeout`. This is a database-side
|
||||||
string must use `sharedInfra.postgres.appUsername`, while the init container uses
|
safety net for leaked idle transactions and does not change database users,
|
||||||
the administrator credential only to idempotently provision the non-superuser
|
passwords, roles, or the PostgreSQL StatefulSet credential model.
|
||||||
application role and its database-local idle transaction timeout.
|
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
@@ -21,6 +20,5 @@ 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
|
||||||
```
|
```
|
||||||
@@ -1,99 +0,0 @@
|
|||||||
\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,6 @@
|
|||||||
{{- .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 -}}
|
||||||
@@ -63,8 +59,7 @@ 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.appUsername }}"
|
POSTGRESQL_USERNAME: "{{ .Values.sharedInfra.postgres.username }}"
|
||||||
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 }}"
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
{{- $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,7 +4,6 @@
|
|||||||
{{- $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
|
||||||
@@ -25,58 +24,12 @@ 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 }}
|
||||||
initContainers:
|
{{- with $.Values.imagePullSecrets }}
|
||||||
- name: provision-postgres-role
|
imagePullSecrets:
|
||||||
image: {{ .Values.images.postgres.repository }}:{{ .Values.images.postgres.tag | default "latest" }}
|
{{- toYaml . | nindent 8 }}
|
||||||
imagePullPolicy: IfNotPresent
|
{{- end }}
|
||||||
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 }}
|
{{ $backendImg := .Values.images.backend }}
|
||||||
@@ -97,16 +50,6 @@ 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
|
||||||
@@ -123,10 +66,6 @@ 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
|
||||||
@@ -164,6 +103,10 @@ 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 }}"
|
||||||
@@ -191,6 +134,10 @@ 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 }}
|
{{ $frontendImg := .Values.images.frontend }}
|
||||||
@@ -261,20 +208,21 @@ 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: {{ .Values.images.postgres.repository }}:{{ .Values.images.postgres.tag | default "latest" }}
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
env:
|
env:
|
||||||
- name: POSTGRES_PASSWORD
|
- name: POSTGRES_PASSWORD
|
||||||
valueFrom:
|
value: "{{ .Values.sharedInfra.postgres.password }}"
|
||||||
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.adminUsername }}"
|
value: "{{ .Values.sharedInfra.postgres.username }}"
|
||||||
- name: PGDATA
|
- name: PGDATA
|
||||||
value: /var/lib/postgresql/data/pgdata
|
value: /var/lib/postgresql/data/pgdata
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
registry: 192.168.1.105:8888/mixingx
|
registry: 192.168.1.105:8888/mixingx
|
||||||
tag: latest
|
tag: latest
|
||||||
timezone: Asia/Shanghai
|
timezone: Asia/Shanghai
|
||||||
|
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
|
||||||
|
imagePullSecrets: []
|
||||||
|
|
||||||
|
|
||||||
role: agent
|
role: agent
|
||||||
site: "0"
|
site: "0"
|
||||||
@@ -42,16 +45,10 @@ sharedInfra:
|
|||||||
host: ultra-service
|
host: ultra-service
|
||||||
port: 8080
|
port: 8080
|
||||||
postgres:
|
postgres:
|
||||||
adminUsername: postgres
|
username: postgres
|
||||||
appUsername: agent_runtime
|
password: "Admin12345"
|
||||||
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,5 +2,5 @@ apiVersion: v2
|
|||||||
name: mixingx-audit
|
name: mixingx-audit
|
||||||
description: MixingX audit service.
|
description: MixingX audit service.
|
||||||
type: application
|
type: application
|
||||||
version: 0.1.0
|
version: 1.0.14
|
||||||
appVersion: "1.0.1"
|
appVersion: "1.0.14"
|
||||||
@@ -32,6 +32,10 @@ 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: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
||||||
|
|||||||
@@ -22,6 +22,10 @@ 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: {{ .Values.audit.mqtt.image | default "emqx/nanomq:0.25.2-2" }}
|
||||||
|
|||||||
@@ -20,6 +20,10 @@ 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: "{{ .Values.registry }}/{{ .Values.images.auditWeb.repository | default "audit-web" }}:{{ .Values.images.auditWeb.tag | default .Values.tag | default "latest" }}"
|
||||||
|
|||||||
@@ -19,6 +19,10 @@ 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: "{{ .Values.registry }}/{{ .Values.images.audit.repository | default "audit" }}:{{ .Values.images.audit.tag | default .Values.tag | default "latest" }}"
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
registry: 192.168.1.105:8888/mixingx
|
registry: 192.168.1.105:8888/mixingx
|
||||||
tag: latest
|
tag: latest
|
||||||
timezone: Asia/Shanghai
|
timezone: Asia/Shanghai
|
||||||
|
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
|
||||||
|
imagePullSecrets: []
|
||||||
|
|
||||||
|
|
||||||
storage:
|
storage:
|
||||||
className: local-path
|
className: local-path
|
||||||
|
|||||||
@@ -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: 0.1.0
|
version: 1.0.14
|
||||||
appVersion: "1.0.1"
|
appVersion: "1.0.14"
|
||||||
@@ -23,6 +23,10 @@ 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: "{{ .Values.mqtt.image.repository }}:{{ .Values.mqtt.image.tag }}"
|
||||||
|
|||||||
@@ -55,6 +55,10 @@ 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 }}
|
{{ $backendImg := .Values.images.backend }}
|
||||||
@@ -167,6 +171,10 @@ 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 }}
|
{{ $frontendImg := .Values.images.frontend }}
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
registry: 192.168.1.105:8888/mixingx
|
registry: 192.168.1.105:8888/mixingx
|
||||||
tag: latest
|
tag: latest
|
||||||
timezone: Asia/Shanghai
|
timezone: Asia/Shanghai
|
||||||
|
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
|
||||||
|
imagePullSecrets: []
|
||||||
|
|
||||||
|
|
||||||
role: edge
|
role: edge
|
||||||
site: "0"
|
site: "0"
|
||||||
|
|||||||
@@ -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: 0.1.0
|
version: 1.0.14
|
||||||
appVersion: "1.0.1"
|
appVersion: "1.0.14"
|
||||||
@@ -26,6 +26,10 @@ 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: {{ .Values.registry }}/{{ $gatewayImage.repository | default "gateway" }}:{{ $gatewayImage.tag | default .Values.tag | default "latest" }}
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
registry: 192.168.1.119:8888/mixingx
|
registry: 192.168.1.119:8888/mixingx
|
||||||
tag: latest
|
tag: latest
|
||||||
timezone: Asia/Shanghai
|
timezone: Asia/Shanghai
|
||||||
|
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
|
||||||
|
imagePullSecrets: []
|
||||||
|
|
||||||
|
|
||||||
storage:
|
storage:
|
||||||
className: local-path
|
className: local-path
|
||||||
|
|||||||
@@ -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: 0.1.0
|
version: 1.0.14
|
||||||
appVersion: "1.0.1"
|
appVersion: "1.0.14"
|
||||||
@@ -31,6 +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: {{ .image }}
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
registry: 192.168.1.105:8888/mixingx
|
registry: 192.168.1.105:8888/mixingx
|
||||||
tag: latest
|
tag: latest
|
||||||
timezone: Asia/Shanghai
|
timezone: Asia/Shanghai
|
||||||
|
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
|
||||||
|
imagePullSecrets: []
|
||||||
|
|
||||||
|
|
||||||
storage:
|
storage:
|
||||||
className: local-path
|
className: local-path
|
||||||
|
|||||||
@@ -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: 0.1.0
|
version: 1.0.14
|
||||||
appVersion: "1.0.1"
|
appVersion: "1.0.14"
|
||||||
@@ -19,6 +19,10 @@ 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: "{{ .Values.mqttx.image.repository }}:{{ .Values.mqttx.image.tag | default "latest" }}"
|
||||||
|
|||||||
@@ -10,6 +10,9 @@
|
|||||||
# Ingress:demo 环境有 *.mixingx.local DNS,用 host 暴露;无 DNS 的现场改用 NodePort。
|
# Ingress:demo 环境有 *.mixingx.local DNS,用 host 暴露;无 DNS 的现场改用 NodePort。
|
||||||
|
|
||||||
timezone: Asia/Shanghai
|
timezone: Asia/Shanghai
|
||||||
|
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
|
||||||
|
imagePullSecrets: []
|
||||||
|
|
||||||
|
|
||||||
mqttx:
|
mqttx:
|
||||||
name: mqttx
|
name: mqttx
|
||||||
|
|||||||
@@ -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: 0.1.0
|
version: 1.0.14
|
||||||
appVersion: "1.0.1"
|
appVersion: "1.0.14"
|
||||||
@@ -51,13 +51,10 @@ 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
|
# 只需 root + D-Bus socket,无需 privileged 与额外 capability:
|
||||||
# NET_ADMIN: 清除切换静态后残留的动态地址(ip addr del 需要此能力)
|
# nmcli 经 D-Bus 操作主机 NM,特权动作(改 IP/路由)全部由 NM 进程执行
|
||||||
runAsUser: 0
|
runAsUser: 0
|
||||||
allowPrivilegeEscalation: false
|
allowPrivilegeEscalation: false
|
||||||
capabilities:
|
|
||||||
add:
|
|
||||||
- NET_ADMIN
|
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /api/network/health
|
path: /api/network/health
|
||||||
@@ -80,15 +77,8 @@ 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
|
||||||
- name: nm-run
|
|
||||||
mountPath: /run/NetworkManager
|
|
||||||
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: nm-run
|
|
||||||
hostPath:
|
|
||||||
path: /run/NetworkManager
|
|
||||||
type: DirectoryOrCreate
|
|
||||||
@@ -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: 0.1.0
|
version: 1.0.14
|
||||||
appVersion: "1.0.1"
|
appVersion: "1.0.14"
|
||||||
@@ -25,6 +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: {{ $root.Values.registry }}/{{ .image }}:{{ $root.Values.tag | default "latest" }}
|
||||||
@@ -156,6 +160,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: {{ $root.Values.registry }}/{{ .image }}:{{ $root.Values.tag | default "latest" }}
|
||||||
@@ -224,6 +232,10 @@ 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: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
||||||
|
|||||||
@@ -20,6 +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" }}"
|
image: "{{ .Values.registry }}/{{ .Values.audit.image }}:{{ .Values.tag | default "latest" }}"
|
||||||
@@ -141,6 +145,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" }}"
|
image: "{{ .Values.registry }}/{{ .Values.audit.webImage }}:{{ .Values.tag | default "latest" }}"
|
||||||
@@ -206,6 +214,10 @@ 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: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
||||||
|
|||||||
@@ -31,6 +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: {{ .image }}
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
registry: 192.168.1.105:8888/mixingx
|
registry: 192.168.1.105:8888/mixingx
|
||||||
tag: latest
|
tag: latest
|
||||||
timezone: Asia/Shanghai
|
timezone: Asia/Shanghai
|
||||||
|
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
|
||||||
|
imagePullSecrets: []
|
||||||
|
|
||||||
|
|
||||||
storage:
|
storage:
|
||||||
className: local-path
|
className: local-path
|
||||||
|
|||||||
@@ -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: 0.1.0
|
version: 1.0.14
|
||||||
appVersion: "1.0.0"
|
appVersion: "1.0.14"
|
||||||
@@ -24,6 +24,10 @@ 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: {{ .Values.registry }}/{{ $proto.repository | default .Values.image }}:{{ $proto.tag | default .Values.tag | default "latest" }}
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
registry: 192.168.1.105:8888/mixingx
|
registry: 192.168.1.105:8888/mixingx
|
||||||
tag: latest
|
tag: latest
|
||||||
timezone: Asia/Shanghai
|
timezone: Asia/Shanghai
|
||||||
|
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
|
||||||
|
imagePullSecrets: []
|
||||||
|
|
||||||
|
|
||||||
# Legacy image override (kept for backward compatibility).
|
# Legacy image override (kept for backward compatibility).
|
||||||
type: opcua
|
type: opcua
|
||||||
|
|||||||
@@ -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: 0.1.0
|
version: 1.0.14
|
||||||
appVersion: "1.0.1"
|
appVersion: "1.0.14"
|
||||||
@@ -28,6 +28,10 @@ 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: {{ $root.Values.registry }}/{{ $root.Values.images.sso.repository | default "sso" }}:{{ $root.Values.images.sso.tag | default $root.Values.tag | default "latest" }}
|
||||||
@@ -126,6 +130,10 @@ 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: {{ $root.Values.registry }}/{{ $root.Values.images.ssoWeb.repository | default "sso-web" }}:{{ $root.Values.images.ssoWeb.tag | default $root.Values.tag | default "latest" }}
|
||||||
@@ -190,6 +198,10 @@ 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: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
registry: 192.168.1.105:8888/mixingx
|
registry: 192.168.1.105:8888/mixingx
|
||||||
tag: latest
|
tag: latest
|
||||||
timezone: Asia/Shanghai
|
timezone: Asia/Shanghai
|
||||||
|
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
|
||||||
|
imagePullSecrets: []
|
||||||
|
|
||||||
|
|
||||||
storage:
|
storage:
|
||||||
className: local-path
|
className: local-path
|
||||||
|
|||||||
@@ -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: 0.1.0
|
version: 1.0.14
|
||||||
appVersion: "1.0.1"
|
appVersion: "1.0.14"
|
||||||
@@ -33,6 +33,10 @@ 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: {{ $root.Values.registry }}/{{ $root.Values.images.ultra.repository | default "ultra" }}:{{ $root.Values.images.ultra.tag | default $root.Values.tag | default "latest" }}
|
||||||
@@ -129,6 +133,10 @@ 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: {{ $root.Values.registry }}/{{ $root.Values.images.ultraWeb.repository | default "ultra-web" }}:{{ $root.Values.images.ultraWeb.tag | default $root.Values.tag | default "latest" }}
|
||||||
@@ -193,6 +201,10 @@ 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: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
registry: 192.168.1.105:8888/mixingx
|
registry: 192.168.1.105:8888/mixingx
|
||||||
tag: latest
|
tag: latest
|
||||||
timezone: Asia/Shanghai
|
timezone: Asia/Shanghai
|
||||||
|
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
|
||||||
|
imagePullSecrets: []
|
||||||
|
|
||||||
|
|
||||||
storage:
|
storage:
|
||||||
className: local-path
|
className: local-path
|
||||||
|
|||||||
Reference in new issue
Block a user