feat(gitops): split environments and image version
This commit is contained in:
1 parent
b70b40ba74
commit
0c46951446
23 files changed
+273
-33
No files matched your search
@@ -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 }}"
|
||||
@@ -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 }}"
|
||||
File renamed without changes.
File renamed without changes.
@@ -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
|
||||
|
||||
File renamed without changes.
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
agents:
|
||||
- id: demo
|
||||
description: Demo Agent
|
||||
nodeLabel: node1
|
||||
- id: demo-2
|
||||
description: Demo Agent 2
|
||||
nodeLabel: node2
|
||||
@@ -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
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
edges:
|
||||
- id: demo
|
||||
description: Demo Edge
|
||||
nodeLabel: node2
|
||||
- id: demo-2
|
||||
description: Demo Edge 2
|
||||
nodeLabel: node1
|
||||
@@ -0,0 +1,3 @@
|
||||
registry: 192.168.1.105:8888/mixingx
|
||||
tag: kube-node-frontend-refactor-design-202607030337-36
|
||||
timezone: Asia/Shanghai
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -0,0 +1,4 @@
|
||||
agents:
|
||||
- id: demo
|
||||
description: Dev Agent
|
||||
nodeLabel: node1
|
||||
@@ -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
|
||||
@@ -0,0 +1,4 @@
|
||||
edges:
|
||||
- id: demo
|
||||
description: Dev Edge
|
||||
nodeLabel: node2
|
||||
@@ -0,0 +1,3 @@
|
||||
registry: 192.168.1.105:8888/mixingx
|
||||
tag: kube-node-frontend-refactor-design-202607030337-36
|
||||
timezone: Asia/Shanghai
|
||||
@@ -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
|
||||
Reference in new issue
Block a user