Compare commits
38
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
77a743cd6c | ||
|
|
443ada9f4a | ||
|
|
d0c054acc8 | ||
|
|
0e5bd063cc | ||
|
|
ec7a42ccc5 | ||
|
|
5f70e78927 | ||
|
|
bac3af555e | ||
|
|
e16a64439b | ||
|
|
673ac6aa6f | ||
|
|
7bd4d58a6d | ||
|
|
7944c98fdb | ||
|
|
50b47a556a | ||
|
|
60c8b4d90e | ||
|
|
22fd52f20f | ||
|
|
7d1bc2d90c | ||
|
|
ada89158fa | ||
|
|
c3f27ee62b | ||
|
|
b8659270e6 | ||
|
|
bd0f20af0b | ||
|
|
ef0e2b5ce1 | ||
|
|
e6ada86374 | ||
|
|
33908b6955 | ||
|
|
f623c56853 | ||
|
|
1a1847ba7e | ||
|
|
c698fe14cc | ||
|
|
ee378168c0 | ||
|
|
41ccb587a9 | ||
|
|
84ddff1776 | ||
|
|
02583981cb | ||
|
|
bfec34fc70 | ||
|
|
b42271b704 | ||
|
|
3decc0f1a2 | ||
|
|
3bc2c6a1b4 | ||
|
|
1632267279 | ||
|
|
51123401a1 | ||
|
|
04e0105b91 | ||
|
|
3c5dff3857 | ||
|
|
cf0cf6080f |
No files matched your search
@@ -10,6 +10,7 @@ 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,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.24
|
version: 1.0.58
|
||||||
appVersion: "1.0.24"
|
appVersion: "1.0.58"
|
||||||
@@ -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.24
|
version: 1.0.58
|
||||||
appVersion: "1.0.24"
|
appVersion: "1.0.58"
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
apiVersion: v2
|
||||||
|
name: mixingx-codeserver
|
||||||
|
description: MixingX code-server — 浏览器版 VS Code 测试 IDE,预装 GitLens/EditorConfig/Prettier/C#/OPC UA Browser 插件。
|
||||||
|
type: application
|
||||||
|
version: 1.0.58
|
||||||
|
appVersion: "1.0.58"
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
# 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,无需额外注解。
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
{{/*
|
||||||
|
组件名(默认 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 -}}
|
||||||
@@ -0,0 +1,127 @@
|
|||||||
|
{{- $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
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
{{- $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 }}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
# 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,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.24
|
version: 1.0.58
|
||||||
appVersion: "1.0.24"
|
appVersion: "1.0.58"
|
||||||
@@ -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.24
|
version: 1.0.58
|
||||||
appVersion: "1.0.24"
|
appVersion: "1.0.58"
|
||||||
@@ -9,7 +9,9 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
ingressClassName: traefik
|
ingressClassName: traefik
|
||||||
rules:
|
rules:
|
||||||
- host: {{ .Values.ingress.domain }}
|
- {{- if .Values.ingress.domain }}
|
||||||
|
host: {{ .Values.ingress.domain }}
|
||||||
|
{{- end }}
|
||||||
http:
|
http:
|
||||||
paths:
|
paths:
|
||||||
- path: /
|
- path: /
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ 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,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.24
|
version: 1.0.58
|
||||||
appVersion: "1.0.24"
|
appVersion: "1.0.58"
|
||||||
@@ -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.24
|
version: 1.0.58
|
||||||
appVersion: "1.0.24"
|
appVersion: "1.0.58"
|
||||||
@@ -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.24
|
version: 1.0.58
|
||||||
appVersion: "1.0.24"
|
appVersion: "1.0.58"
|
||||||
@@ -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.24
|
version: 1.0.58
|
||||||
appVersion: "1.0.24"
|
appVersion: "1.0.58"
|
||||||
@@ -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.24
|
version: 1.0.58
|
||||||
appVersion: "1.0.24"
|
appVersion: "1.0.58"
|
||||||
@@ -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.24
|
version: 1.0.58
|
||||||
appVersion: "1.0.24"
|
appVersion: "1.0.58"
|
||||||
@@ -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.24
|
version: 1.0.58
|
||||||
appVersion: "1.0.24"
|
appVersion: "1.0.58"
|
||||||
Reference in new issue
Block a user