diff --git a/release-charts/README.md b/release-charts/README.md index ff775f5..4fdf052 100644 --- a/release-charts/README.md +++ b/release-charts/README.md @@ -10,6 +10,7 @@ This directory contains the release-oriented charts for Phase 1 ownership split: - `mixingx-edge-unit`: one edge site release. - `mixingx-agent-unit`: one agent site release. - `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. The chart at the repository root is kept as a legacy all-in-one chart during migration. diff --git a/release-charts/mixingx-codeserver/Chart.yaml b/release-charts/mixingx-codeserver/Chart.yaml new file mode 100644 index 0000000..e268e29 --- /dev/null +++ b/release-charts/mixingx-codeserver/Chart.yaml @@ -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.48 +appVersion: "1.0.48" diff --git a/release-charts/mixingx-codeserver/README.md b/release-charts/mixingx-codeserver/README.md new file mode 100644 index 0000000..8882936 --- /dev/null +++ b/release-charts/mixingx-codeserver/README.md @@ -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 `-data`(`storage.keep=true`,卸载不回收); + 插件/设置烧在镜像层(不落盘,升级镜像即整体更新)。 +- 入口:traefik ingress(`*.mixingx.local` DNS 环境),无 DNS 现场改 NodePort(参考 mqttx 注释)。 +- 注意:单副本 + RWO 盘,Deployment 策略 Recreate;traefik 原生支持 WebSocket,无需额外注解。 diff --git a/release-charts/mixingx-codeserver/templates/_helpers.tpl b/release-charts/mixingx-codeserver/templates/_helpers.tpl new file mode 100644 index 0000000..a088f32 --- /dev/null +++ b/release-charts/mixingx-codeserver/templates/_helpers.tpl @@ -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 -}} diff --git a/release-charts/mixingx-codeserver/templates/codeserver.yaml b/release-charts/mixingx-codeserver/templates/codeserver.yaml new file mode 100644 index 0000000..67d137b --- /dev/null +++ b/release-charts/mixingx-codeserver/templates/codeserver.yaml @@ -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 diff --git a/release-charts/mixingx-codeserver/templates/ingress.yaml b/release-charts/mixingx-codeserver/templates/ingress.yaml new file mode 100644 index 0000000..1b9c032 --- /dev/null +++ b/release-charts/mixingx-codeserver/templates/ingress.yaml @@ -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 }} diff --git a/release-charts/mixingx-codeserver/values.yaml b/release-charts/mixingx-codeserver/values.yaml new file mode 100644 index 0000000..0880811 --- /dev/null +++ b/release-charts/mixingx-codeserver/values.yaml @@ -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://。 + +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