From 0c46951446e6d82b6c78ad73f0fb7d96ea09ee11 Mon Sep 17 00:00:00 2001 From: ximenchuifeng Date: Mon, 6 Jul 2026 11:06:52 +0800 Subject: [PATCH] feat(gitops): split environments and image version --- applications/{ => demo}/agents.yaml | 18 ++++---- applications/{ => demo}/edges.yaml | 18 ++++---- applications/{ => demo}/longhorn-ui.yaml | 0 applications/{ => demo}/longhorn.yaml | 0 applications/{ => demo}/platform.yaml | 2 +- applications/{ => demo}/storageclasses.yaml | 0 applications/dev/agents.yaml | 49 +++++++++++++++++++++ applications/dev/edges.yaml | 49 +++++++++++++++++++++ applications/dev/platform.yaml | 25 +++++++++++ bootstrap/mixingx-demo-root.yaml | 8 ++-- bootstrap/mixingx-dev-root.yaml | 20 +++++++++ environments/demo/agent-common-values.yaml | 4 -- environments/demo/agents.yaml | 7 +++ environments/demo/edge-common-values.yaml | 4 -- environments/demo/edges.yaml | 7 +++ environments/demo/image-version.yaml | 3 ++ environments/demo/platform-values.yaml | 4 -- environments/dev/agent-common-values.yaml | 24 ++++++++++ environments/dev/agents.yaml | 4 ++ environments/dev/edge-common-values.yaml | 24 ++++++++++ environments/dev/edges.yaml | 4 ++ environments/dev/image-version.yaml | 3 ++ environments/dev/platform-values.yaml | 29 ++++++++++++ 23 files changed, 273 insertions(+), 33 deletions(-) rename applications/{ => demo}/agents.yaml (76%) rename applications/{ => demo}/edges.yaml (76%) rename applications/{ => demo}/longhorn-ui.yaml (100%) rename applications/{ => demo}/longhorn.yaml (100%) rename applications/{ => demo}/platform.yaml (92%) rename applications/{ => demo}/storageclasses.yaml (100%) create mode 100644 applications/dev/agents.yaml create mode 100644 applications/dev/edges.yaml create mode 100644 applications/dev/platform.yaml create mode 100644 bootstrap/mixingx-dev-root.yaml create mode 100644 environments/demo/agents.yaml create mode 100644 environments/demo/edges.yaml create mode 100644 environments/demo/image-version.yaml create mode 100644 environments/dev/agent-common-values.yaml create mode 100644 environments/dev/agents.yaml create mode 100644 environments/dev/edge-common-values.yaml create mode 100644 environments/dev/edges.yaml create mode 100644 environments/dev/image-version.yaml create mode 100644 environments/dev/platform-values.yaml diff --git a/applications/agents.yaml b/applications/demo/agents.yaml similarity index 76% rename from applications/agents.yaml rename to applications/demo/agents.yaml index bab5c45..da5a72e 100644 --- a/applications/agents.yaml +++ b/applications/demo/agents.yaml @@ -8,14 +8,15 @@ spec: goTemplateOptions: - missingkey=error generators: - - list: - elements: - - id: demo - description: Demo Agent - nodeLabel: node1 - - id: demo-2 - description: Demo Agent 2 - nodeLabel: node2 + - matrix: + generators: + - git: + repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git + revision: master + files: + - path: environments/demo/agents.yaml + - list: + elementsYaml: '{{ .agents | toJson }}' template: metadata: name: 'mixingx-agent-{{ .id }}' @@ -28,6 +29,7 @@ spec: helm: releaseName: 'mixingx-agent-{{ .id }}' valueFiles: + - $values/environments/demo/image-version.yaml - $values/environments/demo/agent-common-values.yaml values: | site: "{{ .id }}" diff --git a/applications/edges.yaml b/applications/demo/edges.yaml similarity index 76% rename from applications/edges.yaml rename to applications/demo/edges.yaml index a14f597..a5601ce 100644 --- a/applications/edges.yaml +++ b/applications/demo/edges.yaml @@ -8,14 +8,15 @@ spec: goTemplateOptions: - missingkey=error generators: - - list: - elements: - - id: demo - description: Demo Edge - nodeLabel: node2 - - id: demo-2 - description: Demo Edge 2 - nodeLabel: node1 + - matrix: + generators: + - git: + repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git + revision: master + files: + - path: environments/demo/edges.yaml + - list: + elementsYaml: '{{ .edges | toJson }}' template: metadata: name: 'mixingx-edge-{{ .id }}' @@ -28,6 +29,7 @@ spec: helm: releaseName: 'mixingx-edge-{{ .id }}' valueFiles: + - $values/environments/demo/image-version.yaml - $values/environments/demo/edge-common-values.yaml values: | site: "{{ .id }}" diff --git a/applications/longhorn-ui.yaml b/applications/demo/longhorn-ui.yaml similarity index 100% rename from applications/longhorn-ui.yaml rename to applications/demo/longhorn-ui.yaml diff --git a/applications/longhorn.yaml b/applications/demo/longhorn.yaml similarity index 100% rename from applications/longhorn.yaml rename to applications/demo/longhorn.yaml diff --git a/applications/platform.yaml b/applications/demo/platform.yaml similarity index 92% rename from applications/platform.yaml rename to applications/demo/platform.yaml index ff94986..5c518f1 100644 --- a/applications/platform.yaml +++ b/applications/demo/platform.yaml @@ -12,6 +12,7 @@ spec: helm: releaseName: mixingx-platform valueFiles: + - $values/environments/demo/image-version.yaml - $values/environments/demo/platform-values.yaml - repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git targetRevision: master @@ -22,4 +23,3 @@ spec: syncPolicy: syncOptions: - CreateNamespace=true - diff --git a/applications/storageclasses.yaml b/applications/demo/storageclasses.yaml similarity index 100% rename from applications/storageclasses.yaml rename to applications/demo/storageclasses.yaml diff --git a/applications/dev/agents.yaml b/applications/dev/agents.yaml new file mode 100644 index 0000000..78e7154 --- /dev/null +++ b/applications/dev/agents.yaml @@ -0,0 +1,49 @@ +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: mixingx-dev-agents + namespace: argocd +spec: + goTemplate: true + goTemplateOptions: + - missingkey=error + generators: + - matrix: + generators: + - git: + repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git + revision: master + files: + - path: environments/dev/agents.yaml + - list: + elementsYaml: '{{ .agents | toJson }}' + template: + metadata: + name: 'mixingx-dev-agent-{{ .id }}' + spec: + project: default + sources: + - repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git + targetRevision: master + path: release-charts/mixingx-agent-unit + helm: + releaseName: 'mixingx-dev-agent-{{ .id }}' + valueFiles: + - $values/environments/dev/image-version.yaml + - $values/environments/dev/agent-common-values.yaml + values: | + site: "{{ .id }}" + description: "{{ .description }}" + {{- if .nodeLabel }} + nodeSelector: + mixingx.io/edge-node: "{{ .nodeLabel }}" + {{- end }} + - repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git + targetRevision: master + ref: values + destination: + server: https://kubernetes.default.svc + namespace: mixingx-dev + syncPolicy: + syncOptions: + - CreateNamespace=true diff --git a/applications/dev/edges.yaml b/applications/dev/edges.yaml new file mode 100644 index 0000000..d93e2d8 --- /dev/null +++ b/applications/dev/edges.yaml @@ -0,0 +1,49 @@ +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: mixingx-dev-edges + namespace: argocd +spec: + goTemplate: true + goTemplateOptions: + - missingkey=error + generators: + - matrix: + generators: + - git: + repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git + revision: master + files: + - path: environments/dev/edges.yaml + - list: + elementsYaml: '{{ .edges | toJson }}' + template: + metadata: + name: 'mixingx-dev-edge-{{ .id }}' + spec: + project: default + sources: + - repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git + targetRevision: master + path: release-charts/mixingx-edge-unit + helm: + releaseName: 'mixingx-dev-edge-{{ .id }}' + valueFiles: + - $values/environments/dev/image-version.yaml + - $values/environments/dev/edge-common-values.yaml + values: | + site: "{{ .id }}" + description: "{{ .description }}" + {{- if .nodeLabel }} + nodeSelector: + mixingx.io/edge-node: "{{ .nodeLabel }}" + {{- end }} + - repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git + targetRevision: master + ref: values + destination: + server: https://kubernetes.default.svc + namespace: mixingx-dev + syncPolicy: + syncOptions: + - CreateNamespace=true diff --git a/applications/dev/platform.yaml b/applications/dev/platform.yaml new file mode 100644 index 0000000..d0d93e5 --- /dev/null +++ b/applications/dev/platform.yaml @@ -0,0 +1,25 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: mixingx-dev-platform + namespace: argocd +spec: + project: default + sources: + - repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git + targetRevision: master + path: release-charts/mixingx-platform + helm: + releaseName: mixingx-dev-platform + valueFiles: + - $values/environments/dev/image-version.yaml + - $values/environments/dev/platform-values.yaml + - repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git + targetRevision: master + ref: values + destination: + server: https://kubernetes.default.svc + namespace: mixingx-dev + syncPolicy: + syncOptions: + - CreateNamespace=true diff --git a/bootstrap/mixingx-demo-root.yaml b/bootstrap/mixingx-demo-root.yaml index 6bb08ce..a5adc60 100644 --- a/bootstrap/mixingx-demo-root.yaml +++ b/bootstrap/mixingx-demo-root.yaml @@ -8,13 +8,13 @@ spec: source: repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git targetRevision: master - path: applications - directory: - recurse: true + path: applications/demo destination: server: https://kubernetes.default.svc namespace: argocd syncPolicy: + automated: + prune: false + selfHeal: true syncOptions: - CreateNamespace=true - diff --git a/bootstrap/mixingx-dev-root.yaml b/bootstrap/mixingx-dev-root.yaml new file mode 100644 index 0000000..f80b9a9 --- /dev/null +++ b/bootstrap/mixingx-dev-root.yaml @@ -0,0 +1,20 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: mixingx-dev-root + namespace: argocd +spec: + project: default + source: + repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git + targetRevision: master + path: applications/dev + destination: + server: https://kubernetes.default.svc + namespace: argocd + syncPolicy: + automated: + prune: false + selfHeal: true + syncOptions: + - CreateNamespace=true diff --git a/environments/demo/agent-common-values.yaml b/environments/demo/agent-common-values.yaml index 85edb5a..e718cc7 100644 --- a/environments/demo/agent-common-values.yaml +++ b/environments/demo/agent-common-values.yaml @@ -1,7 +1,3 @@ -registry: 192.168.1.105:8888/mixingx -tag: kube-node-frontend-refactor-design-202607030337-36 -timezone: Asia/Shanghai - storage: className: longhorn-edge-local size: 5Gi diff --git a/environments/demo/agents.yaml b/environments/demo/agents.yaml new file mode 100644 index 0000000..244b4ee --- /dev/null +++ b/environments/demo/agents.yaml @@ -0,0 +1,7 @@ +agents: + - id: demo + description: Demo Agent + nodeLabel: node1 + - id: demo-2 + description: Demo Agent 2 + nodeLabel: node2 diff --git a/environments/demo/edge-common-values.yaml b/environments/demo/edge-common-values.yaml index 8ad7b07..dca05d5 100644 --- a/environments/demo/edge-common-values.yaml +++ b/environments/demo/edge-common-values.yaml @@ -1,7 +1,3 @@ -registry: 192.168.1.105:8888/mixingx -tag: kube-node-frontend-refactor-design-202607030337-36 -timezone: Asia/Shanghai - storage: className: longhorn-edge-local size: 5Gi diff --git a/environments/demo/edges.yaml b/environments/demo/edges.yaml new file mode 100644 index 0000000..e8360b7 --- /dev/null +++ b/environments/demo/edges.yaml @@ -0,0 +1,7 @@ +edges: + - id: demo + description: Demo Edge + nodeLabel: node2 + - id: demo-2 + description: Demo Edge 2 + nodeLabel: node1 diff --git a/environments/demo/image-version.yaml b/environments/demo/image-version.yaml new file mode 100644 index 0000000..f40c301 --- /dev/null +++ b/environments/demo/image-version.yaml @@ -0,0 +1,3 @@ +registry: 192.168.1.105:8888/mixingx +tag: kube-node-frontend-refactor-design-202607030337-36 +timezone: Asia/Shanghai diff --git a/environments/demo/platform-values.yaml b/environments/demo/platform-values.yaml index 01d726a..6f0df0f 100644 --- a/environments/demo/platform-values.yaml +++ b/environments/demo/platform-values.yaml @@ -1,7 +1,3 @@ -registry: 192.168.1.105:8888/mixingx -tag: kube-node-frontend-refactor-design-202607030337-36 -timezone: Asia/Shanghai - storage: className: longhorn-platform diff --git a/environments/dev/agent-common-values.yaml b/environments/dev/agent-common-values.yaml new file mode 100644 index 0000000..e718cc7 --- /dev/null +++ b/environments/dev/agent-common-values.yaml @@ -0,0 +1,24 @@ +storage: + className: longhorn-edge-local + size: 5Gi + keep: true + +images: + backend: agent + frontend: agent-web + postgres: 192.168.1.105:8888/docker-proxy/library/postgres:17 + +sharedInfra: + postgres: + username: postgres + password: "Admin12345" + port: 5432 + redis: + host: redis-service + port: 6379 + password: "Admin12345" + rabbitmq: + host: messaging-service + port: 5672 + username: guest + password: guest diff --git a/environments/dev/agents.yaml b/environments/dev/agents.yaml new file mode 100644 index 0000000..950d262 --- /dev/null +++ b/environments/dev/agents.yaml @@ -0,0 +1,4 @@ +agents: + - id: demo + description: Dev Agent + nodeLabel: node1 diff --git a/environments/dev/edge-common-values.yaml b/environments/dev/edge-common-values.yaml new file mode 100644 index 0000000..dca05d5 --- /dev/null +++ b/environments/dev/edge-common-values.yaml @@ -0,0 +1,24 @@ +storage: + className: longhorn-edge-local + size: 5Gi + keep: true + +images: + backend: edge + frontend: edge-web + postgres: 192.168.1.105:8888/docker-proxy/library/postgres:17 + +sharedInfra: + postgres: + username: postgres + password: "Admin12345" + port: 5432 + redis: + host: redis-service + port: 6379 + password: "Admin12345" + rabbitmq: + host: messaging-service + port: 5672 + username: guest + password: guest diff --git a/environments/dev/edges.yaml b/environments/dev/edges.yaml new file mode 100644 index 0000000..9f56e74 --- /dev/null +++ b/environments/dev/edges.yaml @@ -0,0 +1,4 @@ +edges: + - id: demo + description: Dev Edge + nodeLabel: node2 diff --git a/environments/dev/image-version.yaml b/environments/dev/image-version.yaml new file mode 100644 index 0000000..f40c301 --- /dev/null +++ b/environments/dev/image-version.yaml @@ -0,0 +1,3 @@ +registry: 192.168.1.105:8888/mixingx +tag: kube-node-frontend-refactor-design-202607030337-36 +timezone: Asia/Shanghai diff --git a/environments/dev/platform-values.yaml b/environments/dev/platform-values.yaml new file mode 100644 index 0000000..84678f9 --- /dev/null +++ b/environments/dev/platform-values.yaml @@ -0,0 +1,29 @@ +storage: + className: longhorn-platform + +ingress: + enabled: true + domain: dev.mixingx.local + gatewayService: gateway-service + gatewayPort: 8080 + +sharedDatastores: + - name: redis + image: 192.168.1.105:8888/docker-proxy/library/redis:8.6 + port: 6379 + storage: 2Gi + mountPath: /data + - name: mongo + image: 192.168.1.105:8888/docker-proxy/library/mongo:8.3 + port: 27017 + storage: 5Gi + mountPath: /data/db + - name: messaging + image: 192.168.1.105:8888/docker-proxy/library/rabbitmq:4.3-management + port: 5672 + storage: 2Gi + mountPath: /var/lib/rabbitmq + +sharedInfra: + postgres: + image: 192.168.1.105:8888/docker-proxy/library/postgres:17