From a67c251486912efab3667213cd80eee899b5d410 Mon Sep 17 00:00:00 2001 From: ximenchuifeng Date: Fri, 3 Jul 2026 16:00:34 +0800 Subject: [PATCH] feat(agent): manage demo agents with applicationset --- README.md | 18 ++++++++ applications/agent-demo.yaml | 25 ----------- applications/agents.yaml | 44 +++++++++++++++++++ ...o-values.yaml => agent-common-values.yaml} | 4 -- 4 files changed, 62 insertions(+), 29 deletions(-) delete mode 100644 applications/agent-demo.yaml create mode 100644 applications/agents.yaml rename environments/demo/{agent-demo-values.yaml => agent-common-values.yaml} (93%) diff --git a/README.md b/README.md index d18a6de..d6d873f 100644 --- a/README.md +++ b/README.md @@ -17,3 +17,21 @@ Demo environment: 2. Apply or create `bootstrap/mixingx-demo-root.yaml`. 3. Argo CD will create/sync the applications under `applications/`. +Agent fleet: + +- `applications/agents.yaml` is an Argo CD ApplicationSet. +- `environments/demo/agent-common-values.yaml` contains shared Helm values for all agents. +- Add or remove agent instances by editing `spec.generators[0].list.elements` in `applications/agents.yaml`. +- Prefer `nodeLabel` over `nodeName`; label the target node so Kubernetes scheduler can still bind local-path PVCs. + +Example: + +```bash +kubectl label node node1 mixingx.io/edge-node=shanghai +``` + +```yaml +- id: shanghai + description: Shanghai Agent + nodeLabel: shanghai +``` diff --git a/applications/agent-demo.yaml b/applications/agent-demo.yaml deleted file mode 100644 index 82449eb..0000000 --- a/applications/agent-demo.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: mixingx-agent-demo - namespace: argocd -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-agent-demo - valueFiles: - - $values/environments/demo/agent-demo-values.yaml - - repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git - targetRevision: master - ref: values - destination: - server: https://kubernetes.default.svc - namespace: mixingx - syncPolicy: - syncOptions: - - CreateNamespace=true - diff --git a/applications/agents.yaml b/applications/agents.yaml new file mode 100644 index 0000000..38e3e34 --- /dev/null +++ b/applications/agents.yaml @@ -0,0 +1,44 @@ +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: mixingx-agents + namespace: argocd +spec: + goTemplate: true + goTemplateOptions: + - missingkey=error + generators: + - list: + elements: + - id: demo + description: Demo Agent + nodeLabel: "" + template: + metadata: + name: 'mixingx-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-agent-{{ .id }}' + valueFiles: + - $values/environments/demo/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 + syncPolicy: + syncOptions: + - CreateNamespace=true diff --git a/environments/demo/agent-demo-values.yaml b/environments/demo/agent-common-values.yaml similarity index 93% rename from environments/demo/agent-demo-values.yaml rename to environments/demo/agent-common-values.yaml index 141c753..32ddaa6 100644 --- a/environments/demo/agent-demo-values.yaml +++ b/environments/demo/agent-common-values.yaml @@ -2,9 +2,6 @@ registry: 192.168.1.105:8888/mixingx tag: kube-node-frontend-refactor-design-202607030337-36 timezone: Asia/Shanghai -site: demo -description: "Demo Agent" - storage: className: local-path size: 5Gi @@ -29,4 +26,3 @@ sharedInfra: port: 5672 username: guest password: guest -