LingxinMeng 1 ano atrás
pai
commit
8757584567

+ 2 - 1
amd64/dispatch_server/package/infra/application.yaml

@@ -39,7 +39,7 @@ gpu-node-list:
 
 k8s:
   pod-yaml-dir: /mnt/disk001/cicv-data-closedloop/pod-yaml/
-  vtd-pod-template-yaml: /mnt/disk001/cicv-data-closedloop/amd64/dispatch_server/vtd-pod-template_20240506.yaml
+  vtd-pod-template-yaml: /mnt/disk001/cicv-data-closedloop/amd64/dispatch_server/vtd-pod-template_20240522.yaml
   algorithm-tar-temp-dir: /mnt/disk001/cicv-data-closedloop/temp/algorithm/
   registry-uri: 10.14.85.237:5000
   namespace-name: cicvdcl
@@ -47,4 +47,5 @@ k8s:
 #  vtd-command: /Controller/config/docker_cloud_algContest.ini
   vtd-command: /Controller/config/docker_cloud.ini
   callback-uri: http://10.14.86.127:9081/project/task/callback
+  platform-type: 2
 

+ 1 - 0
amd64/dispatch_server/package/infra/i_application.go

@@ -66,6 +66,7 @@ type K8sStruct struct {
 	VtdImage            string `yaml:"vtd-image"`
 	VtdCommand          string `yaml:"vtd-command"`
 	CallbackUri         string `yaml:"callback-uri"`
+	PlatformType        string `yaml:"platform-type"`
 }
 
 var (

+ 2 - 0
amd64/dispatch_server/package/service/run_task.go

@@ -242,6 +242,8 @@ func RunWaitingCluster() {
 		podString = strings.Replace(podString, "vtd-image", vtdImage, -1)
 		podString = strings.Replace(podString, "vtd-command", infra.ApplicationYaml.K8s.VtdCommand, -1)
 		podString = strings.Replace(podString, "platform-ip", infra.ApplicationYaml.Web.IpPrivate+":"+infra.ApplicationYaml.Web.Port, -1)
+		podString = strings.Replace(podString, "simulation-cloud-ip", infra.ApplicationYaml.Web.IpPrivate+":"+infra.ApplicationYaml.Web.Port, -1)
+		podString = strings.Replace(podString, "platform-type", "\""+infra.ApplicationYaml.K8s.PlatformType+"\"", -1)
 		podString = strings.Replace(podString, "oss-type", infra.ApplicationYaml.Oss.Type, -1)
 		podString = strings.Replace(podString, "oss-ip", infra.ApplicationYaml.Oss.Endpoint, -1) // 不带http://前缀
 		podString = strings.Replace(podString, "oss-access-key", infra.ApplicationYaml.Oss.AccessKeyId, -1)