feat(delivery): 全 chart 支持 imagePullSecrets(默认空,内网零变化)+ 交付镜像清单

- 10 个 chart values 顶层加 imagePullSecrets: [](ADR-0066)
- 27 处 Pod spec 注入 with 块;platform _workloads.tpl 用 $root 上下文
- 默认渲染与改动前 bit 级一致(helm template 验证);注入测试 10/10 通过
- delivery/image-manifest.yaml: 第三方镜像 ACR 核对清单(nanomq 为当前缺口)
This commit is contained in:
ximenchuifeng committed 2026-08-22 13:06:46 +08:00
1 parent c4527a8ec5
commit 601151bfae
27 files changed
+161

No files matched your search

+23
View File
@@ -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: false } # ⚠️ 缺口(D2)
# ── 工具类 ──
- { upstream: docker.io/library/busybox:latest, acr: library/busybox:latest, pushed: true }
- { upstream: docker.io/library/alpine:3, acr: library/alpine:3, pushed: true }
# ── 可选(客户默认不部署) ──
- { upstream: docker.io/emqx/mqttx-web:latest, acr: library/mqttx-web:latest, pushed: false, optional: true }
- { upstream: docker.io/library/mongo:7.0, acr: library/mongo:7.0, pushed: true, optional: true } # v2 audit 已去 mongo,存量备用
@@ -26,6 +26,10 @@ spec:
checksum/config: {{ include "mixingx-unit.backendConfigData" . | sha256sum }}
spec:
{{ include "mixingx-unit.backendScheduling" . | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ $name }}
{{ $backendImg := .Values.images.backend }}
@@ -130,6 +134,10 @@ spec:
app.kubernetes.io/component: {{ $webName }}
spec:
{{ include "mixingx-unit.followerScheduling" . | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ $webName }}
{{ $frontendImg := .Values.images.frontend }}
@@ -200,6 +208,10 @@ spec:
app.kubernetes.io/component: {{ $name }}-postgres
spec:
{{ include "mixingx-unit.followerScheduling" . | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: postgres
image: {{ .Values.images.postgres.repository }}:{{ .Values.images.postgres.tag | default "latest" }}
@@ -1,6 +1,9 @@
registry: 192.168.1.105:8888/mixingx
tag: latest
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
role: agent
site: "0"
@@ -32,6 +32,10 @@ spec:
app.kubernetes.io/component: {{ .Values.audit.database }}-postgres
spec:
{{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: postgres
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
@@ -22,6 +22,10 @@ spec:
app.kubernetes.io/component: audit-nanomq
spec:
{{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: nanomq
image: {{ .Values.audit.mqtt.image | default "emqx/nanomq:0.25.2-2" }}
@@ -20,6 +20,10 @@ spec:
app.kubernetes.io/component: audit-web
spec:
{{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: audit-web
image: "{{ .Values.registry }}/{{ .Values.images.auditWeb.repository | default "audit-web" }}:{{ .Values.images.auditWeb.tag | default .Values.tag | default "latest" }}"
@@ -19,6 +19,10 @@ spec:
app.kubernetes.io/component: audit
spec:
{{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: audit
image: "{{ .Values.registry }}/{{ .Values.images.audit.repository | default "audit" }}:{{ .Values.images.audit.tag | default .Values.tag | default "latest" }}"
+3
View File
@@ -1,6 +1,9 @@
registry: 192.168.1.105:8888/mixingx
tag: latest
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
storage:
className: local-path
@@ -23,6 +23,10 @@ spec:
app.kubernetes.io/component: {{ $brokerName }}
spec:
{{ include "mixingx-unit.backendScheduling" . | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: nanomq
image: "{{ .Values.mqtt.image.repository }}:{{ .Values.mqtt.image.tag }}"
@@ -55,6 +55,10 @@ spec:
secret:
secretName: {{ required "edgeSecrets.mounts[].secretName is required" $secret.secretName | quote }}
{{- end }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ $name }}
{{ $backendImg := .Values.images.backend }}
@@ -167,6 +171,10 @@ spec:
app.kubernetes.io/component: {{ $webName }}
spec:
{{ include "mixingx-unit.followerScheduling" . | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ $webName }}
{{ $frontendImg := .Values.images.frontend }}
@@ -1,6 +1,9 @@
registry: 192.168.1.105:8888/mixingx
tag: latest
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
role: edge
site: "0"
@@ -26,6 +26,10 @@ spec:
serviceAccountName: gateway-sa
{{- end }}
{{ include "mixingx-gateway.tierAffinity" (dict "role" "gateway" "root" $) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: gateway
image: {{ .Values.registry }}/{{ $gatewayImage.repository | default "gateway" }}:{{ $gatewayImage.tag | default .Values.tag | default "latest" }}
@@ -1,6 +1,9 @@
registry: 192.168.1.119:8888/mixingx
tag: latest
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
storage:
className: local-path
@@ -31,6 +31,10 @@ spec:
app.kubernetes.io/component: {{ .name }}
spec:
{{ include "mixingx-infra.tierAffinity" (dict "role" "sharedDatastores" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ .name }}
image: {{ .image }}
+3
View File
@@ -1,6 +1,9 @@
registry: 192.168.1.105:8888/mixingx
tag: latest
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
storage:
className: local-path
@@ -19,6 +19,10 @@ spec:
labels:
app.kubernetes.io/component: {{ $name }}
spec:
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ $name }}
image: "{{ .Values.mqttx.image.repository }}:{{ .Values.mqttx.image.tag | default "latest" }}"
+3
View File
@@ -10,6 +10,9 @@
# Ingress:demo 环境有 *.mixingx.local DNS,用 host 暴露;无 DNS 的现场改用 NodePort。
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
mqttx:
name: mqttx
@@ -25,6 +25,10 @@ spec:
serviceAccountName: gateway-sa
{{- end }}
{{ include "mixingx-platform.tierAffinity" (dict "role" .role "root" $root) | nindent 6 }}
{{- with $root.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ .name }}
image: {{ $root.Values.registry }}/{{ .image }}:{{ $root.Values.tag | default "latest" }}
@@ -156,6 +160,10 @@ spec:
app.kubernetes.io/component: {{ .name }}
spec:
{{ include "mixingx-platform.tierAffinity" (dict "role" .tierRole "root" $root) | nindent 6 }}
{{- with $root.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ .name }}
image: {{ $root.Values.registry }}/{{ .image }}:{{ $root.Values.tag | default "latest" }}
@@ -224,6 +232,10 @@ spec:
app.kubernetes.io/component: {{ .name }}-postgres
spec:
{{ include "mixingx-platform.tierAffinity" (dict "role" .tierRole "root" $root) | nindent 6 }}
{{- with $root.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: postgres
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
@@ -20,6 +20,10 @@ spec:
app.kubernetes.io/component: audit
spec:
{{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: audit
image: "{{ .Values.registry }}/{{ .Values.audit.image }}:{{ .Values.tag | default "latest" }}"
@@ -141,6 +145,10 @@ spec:
app.kubernetes.io/component: {{ .Values.audit.webName }}
spec:
{{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ .Values.audit.webName }}
image: "{{ .Values.registry }}/{{ .Values.audit.webImage }}:{{ .Values.tag | default "latest" }}"
@@ -206,6 +214,10 @@ spec:
app.kubernetes.io/component: {{ .Values.audit.database }}-postgres
spec:
{{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: postgres
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
@@ -31,6 +31,10 @@ spec:
app.kubernetes.io/component: {{ .name }}
spec:
{{ include "mixingx-platform.tierAffinity" (dict "role" "sharedDatastores" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ .name }}
image: {{ .image }}
@@ -1,6 +1,9 @@
registry: 192.168.1.105:8888/mixingx
tag: latest
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
storage:
className: local-path
@@ -24,6 +24,10 @@ spec:
{{ toYaml . | nindent 8 }}
{{- end }}
{{- $proto := index .Values.images.protocol .Values.type }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: protocol-server
image: {{ .Values.registry }}/{{ $proto.repository | default .Values.image }}:{{ $proto.tag | default .Values.tag | default "latest" }}
@@ -1,6 +1,9 @@
registry: 192.168.1.105:8888/mixingx
tag: latest
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
# Legacy image override (kept for backward compatibility).
type: opcua
@@ -28,6 +28,10 @@ spec:
app.kubernetes.io/component: {{ $name }}
spec:
{{ include "mixingx-sso.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ $name }}
image: {{ $root.Values.registry }}/{{ $root.Values.images.sso.repository | default "sso" }}:{{ $root.Values.images.sso.tag | default $root.Values.tag | default "latest" }}
@@ -126,6 +130,10 @@ spec:
app.kubernetes.io/component: {{ $webName }}
spec:
{{ include "mixingx-sso.tierAffinity" (dict "role" "web" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ $webName }}
image: {{ $root.Values.registry }}/{{ $root.Values.images.ssoWeb.repository | default "sso-web" }}:{{ $root.Values.images.ssoWeb.tag | default $root.Values.tag | default "latest" }}
@@ -190,6 +198,10 @@ spec:
app.kubernetes.io/component: {{ $name }}-postgres
spec:
{{ include "mixingx-sso.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: postgres
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
+3
View File
@@ -1,6 +1,9 @@
registry: 192.168.1.105:8888/mixingx
tag: latest
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
storage:
className: local-path
@@ -33,6 +33,10 @@ spec:
app.kubernetes.io/component: {{ $name }}
spec:
{{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ $name }}
image: {{ $root.Values.registry }}/{{ $root.Values.images.ultra.repository | default "ultra" }}:{{ $root.Values.images.ultra.tag | default $root.Values.tag | default "latest" }}
@@ -129,6 +133,10 @@ spec:
app.kubernetes.io/component: {{ $name }}-web
spec:
{{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ $name }}-web
image: {{ $root.Values.registry }}/{{ $root.Values.images.ultraWeb.repository | default "ultra-web" }}:{{ $root.Values.images.ultraWeb.tag | default $root.Values.tag | default "latest" }}
@@ -193,6 +201,10 @@ spec:
app.kubernetes.io/component: {{ $name }}-postgres
spec:
{{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: postgres
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
+3
View File
@@ -1,6 +1,9 @@
registry: 192.168.1.105:8888/mixingx
tag: latest
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-0066);内网留空=匿名拉取,行为不变
imagePullSecrets: []
storage:
className: local-path