diff --git a/applications/demo/audit.yaml b/applications/demo/audit.yaml new file mode 100644 index 0000000..7bec698 --- /dev/null +++ b/applications/demo/audit.yaml @@ -0,0 +1,25 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: mixingx-audit + namespace: argocd +spec: + project: default + sources: + - repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git + targetRevision: master + path: release-charts/mixingx-audit + helm: + releaseName: mixingx-audit + valueFiles: + - $values/environments/demo/image-version.yaml + - $values/environments/demo/audit-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/demo/platform.yaml b/applications/demo/disabled/platform-legacy.yaml similarity index 100% rename from applications/demo/platform.yaml rename to applications/demo/disabled/platform-legacy.yaml diff --git a/applications/demo/gateway.yaml b/applications/demo/gateway.yaml new file mode 100644 index 0000000..8807932 --- /dev/null +++ b/applications/demo/gateway.yaml @@ -0,0 +1,25 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: mixingx-gateway + namespace: argocd +spec: + project: default + sources: + - repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git + targetRevision: master + path: release-charts/mixingx-gateway + helm: + releaseName: mixingx-gateway + valueFiles: + - $values/environments/demo/image-version.yaml + - $values/environments/demo/gateway-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/demo/infra.yaml b/applications/demo/infra.yaml new file mode 100644 index 0000000..c7b92ef --- /dev/null +++ b/applications/demo/infra.yaml @@ -0,0 +1,25 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: mixingx-infra + namespace: argocd +spec: + project: default + sources: + - repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git + targetRevision: master + path: release-charts/mixingx-infra + helm: + releaseName: mixingx-infra + valueFiles: + - $values/environments/demo/image-version.yaml + - $values/environments/demo/infra-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/demo/disabled/protocol-servers.yaml b/applications/demo/protocol-servers.yaml similarity index 100% rename from applications/demo/disabled/protocol-servers.yaml rename to applications/demo/protocol-servers.yaml diff --git a/applications/demo/sso.yaml b/applications/demo/sso.yaml new file mode 100644 index 0000000..9d50d2f --- /dev/null +++ b/applications/demo/sso.yaml @@ -0,0 +1,25 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: mixingx-sso + namespace: argocd +spec: + project: default + sources: + - repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git + targetRevision: master + path: release-charts/mixingx-sso + helm: + releaseName: mixingx-sso + valueFiles: + - $values/environments/demo/image-version.yaml + - $values/environments/demo/sso-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/demo/ultra.yaml b/applications/demo/ultra.yaml new file mode 100644 index 0000000..278fa25 --- /dev/null +++ b/applications/demo/ultra.yaml @@ -0,0 +1,25 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: mixingx-ultra + namespace: argocd +spec: + project: default + sources: + - repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git + targetRevision: master + path: release-charts/mixingx-ultra + helm: + releaseName: mixingx-ultra + valueFiles: + - $values/environments/demo/image-version.yaml + - $values/environments/demo/ultra-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/environments/demo/agent-common-values.yaml b/environments/demo/agent-common-values.yaml index a19c3aa..c18eced 100644 --- a/environments/demo/agent-common-values.yaml +++ b/environments/demo/agent-common-values.yaml @@ -4,9 +4,15 @@ storage: keep: true images: - backend: agent - frontend: agent-web - postgres: 192.168.1.119:8888/docker-proxy/library/postgres:17 + backend: + repository: agent + tag: "" + frontend: + repository: agent-web + tag: "" + postgres: + repository: 192.168.1.119:8888/docker-proxy/library/postgres + tag: "17" sharedInfra: postgres: diff --git a/environments/demo/audit-values.yaml b/environments/demo/audit-values.yaml new file mode 100644 index 0000000..81770f4 --- /dev/null +++ b/environments/demo/audit-values.yaml @@ -0,0 +1,20 @@ +sharedInfra: + mongo: + host: mongo-service + port: 27017 + username: admin + password: "Admin12345" + database: mixingx_audit + rabbitmq: + host: messaging-service + port: 5672 + username: guest + password: guest + otlp: + endpoint: http://k8s-dashboard-service:18889 + protocol: grpc + +audit: + enabled: true + port: 5600 + replicas: 2 diff --git a/environments/demo/edge-common-values.yaml b/environments/demo/edge-common-values.yaml index a279dc2..f1a7ebc 100644 --- a/environments/demo/edge-common-values.yaml +++ b/environments/demo/edge-common-values.yaml @@ -4,9 +4,15 @@ storage: keep: true images: - backend: edge - frontend: edge-web - postgres: 192.168.1.119:8888/docker-proxy/library/postgres:17 + backend: + repository: edge + tag: "" + frontend: + repository: edge-web + tag: "" + postgres: + repository: 192.168.1.119:8888/docker-proxy/library/postgres + tag: "17" sharedInfra: postgres: diff --git a/environments/demo/gateway-values.yaml b/environments/demo/gateway-values.yaml new file mode 100644 index 0000000..da81042 --- /dev/null +++ b/environments/demo/gateway-values.yaml @@ -0,0 +1,31 @@ +registry: 192.168.1.119:8888/mixingx +tag: develop-v.1.0.1-202607100034-13 +timezone: Asia/Shanghai + +storage: + className: longhorn-platform + +sharedInfra: + redis: + host: redis-service + port: 6379 + password: Admin12345 + rabbitmq: + host: messaging-service + port: 5672 + username: guest + password: guest + otlp: + endpoint: http://k8s-dashboard-service:18889 + protocol: grpc + +gateway: + port: 8080 + replicas: 2 + rbac: true + +ingress: + enabled: true + domain: app.mixingx.local + gatewayService: gateway-service + gatewayPort: 8080 diff --git a/environments/demo/image-version.yaml b/environments/demo/image-version.yaml index 1d00a89..4440bfc 100644 --- a/environments/demo/image-version.yaml +++ b/environments/demo/image-version.yaml @@ -1,3 +1,21 @@ registry: 192.168.1.119:8888/mixingx tag: develop-v.1.0.1-202607100034-13 timezone: Asia/Shanghai + +images: + gateway: { repository: gateway, tag: "" } + sso: { repository: sso, tag: "" } + ssoWeb: { repository: sso-web, tag: "" } + ultra: { repository: ultra, tag: "" } + ultraWeb: { repository: ultra-web, tag: "" } + audit: { repository: audit, tag: "" } + edge: { repository: edge, tag: "" } + edgeWeb: { repository: edge-web, tag: "" } + agent: { repository: agent, tag: "" } + agentWeb: { repository: agent-web, tag: "" } + protocol: + opcua: { repository: opcua, tag: "" } + modbus: { repository: modbus, tag: "" } + ads: { repository: ads, tag: "" } + s7: { repository: s7, tag: "" } + s7-diecast: { repository: s7-diecast, tag: "" } diff --git a/environments/demo/infra-values.yaml b/environments/demo/infra-values.yaml new file mode 100644 index 0000000..64a2a9a --- /dev/null +++ b/environments/demo/infra-values.yaml @@ -0,0 +1,48 @@ +registry: 192.168.1.119:8888/mixingx +tag: develop-v.1.0.1-202607100034-13 +timezone: Asia/Shanghai + +storage: + className: longhorn-platform + +sharedInfra: + postgres: + image: 192.168.1.119:8888/docker-proxy/library/postgres:17 + username: postgres + password: "Admin12345" + port: 5432 + redis: + host: redis-service + port: 6379 + password: "Admin12345" + rabbitmq: + host: messaging-service + port: 5672 + username: guest + password: guest + mongo: + host: mongo-service + port: 27017 + username: admin + password: "Admin12345" + database: mixingx_audit + otlp: + endpoint: http://k8s-dashboard-service:18889 + protocol: grpc + +sharedDatastores: + - name: redis + image: 192.168.1.119:8888/docker-proxy/library/redis:8.6 + port: 6379 + storage: 2Gi + mountPath: /data + - name: mongo + image: 192.168.1.119:8888/docker-proxy/library/mongo:7.0 + port: 27017 + storage: 5Gi + mountPath: /data/db + - name: messaging + image: 192.168.1.119:8888/docker-proxy/library/rabbitmq:4.3-management + port: 5672 + storage: 2Gi + mountPath: /var/lib/rabbitmq diff --git a/environments/demo/sso-values.yaml b/environments/demo/sso-values.yaml new file mode 100644 index 0000000..fe15280 --- /dev/null +++ b/environments/demo/sso-values.yaml @@ -0,0 +1,31 @@ +storage: + className: longhorn-platform + +sharedInfra: + postgres: + image: 192.168.1.119:8888/docker-proxy/library/postgres:17 + username: postgres + password: "Admin12345" + port: 5432 + redis: + host: redis-service + port: 6379 + password: "Admin12345" + rabbitmq: + host: messaging-service + port: 5672 + username: guest + password: guest + otlp: + endpoint: http://k8s-dashboard-service:18889 + protocol: grpc + +sso: + name: sso + role: sso + serviceId: sso + database: sso-db + pgStorage: 10Gi + replicas: 2 + description: "统一登录" + webBasePath: /sso/ diff --git a/environments/demo/ultra-values.yaml b/environments/demo/ultra-values.yaml new file mode 100644 index 0000000..3fa78d8 --- /dev/null +++ b/environments/demo/ultra-values.yaml @@ -0,0 +1,31 @@ +storage: + className: longhorn-platform + +sharedInfra: + postgres: + image: 192.168.1.119:8888/docker-proxy/library/postgres:17 + username: postgres + password: "Admin12345" + port: 5432 + redis: + host: redis-service + port: 6379 + password: "Admin12345" + rabbitmq: + host: messaging-service + port: 5672 + username: guest + password: guest + otlp: + endpoint: http://k8s-dashboard-service:18889 + protocol: grpc + +ultra: + name: ultra + role: ultra + serviceId: ultra + database: ultra-db + pgStorage: 10Gi + replicas: 2 + description: "Ultra 看板" + webBasePath: /ultra/