|
|
@@ -264,17 +264,20 @@ func RunWaitingCluster() {
|
|
|
continue
|
|
|
}
|
|
|
podString = strings.Replace(podString, "vtd-command", infra.ApplicationYaml.K8s.VtdCommandPjisuv, -1)
|
|
|
- podString = strings.Replace(podString, "oss-type", infra.ApplicationYaml.OssCicv.Type, -1)
|
|
|
- podString = strings.Replace(podString, "oss-ip", infra.ApplicationYaml.OssCicv.Endpoint, -1) // 不带http://前缀
|
|
|
- podString = strings.Replace(podString, "oss-access-key", infra.ApplicationYaml.OssCicv.AccessKeyId, -1)
|
|
|
- podString = strings.Replace(podString, "oss-secret-key", infra.ApplicationYaml.OssCicv.AccessKeySecret, -1)
|
|
|
- podString = strings.Replace(podString, "oss-bucket", infra.ApplicationYaml.OssCicv.BucketName, -1)
|
|
|
} else {
|
|
|
if podString, err = util.ReadFile(infra.ApplicationYaml.K8s.VtdPodTemplateYamlPjibot); err != nil {
|
|
|
infra.GlobalLogger.Error(err)
|
|
|
continue
|
|
|
}
|
|
|
podString = strings.Replace(podString, "vtd-command", infra.ApplicationYaml.K8s.VtdCommandPjibot, -1)
|
|
|
+ }
|
|
|
+ if firstTaskCache.Env == "cicv" {
|
|
|
+ podString = strings.Replace(podString, "oss-type", infra.ApplicationYaml.OssCicv.Type, -1)
|
|
|
+ podString = strings.Replace(podString, "oss-ip", infra.ApplicationYaml.OssCicv.Endpoint, -1) // 不带http://前缀
|
|
|
+ podString = strings.Replace(podString, "oss-access-key", infra.ApplicationYaml.OssCicv.AccessKeyId, -1)
|
|
|
+ podString = strings.Replace(podString, "oss-secret-key", infra.ApplicationYaml.OssCicv.AccessKeySecret, -1)
|
|
|
+ podString = strings.Replace(podString, "oss-bucket", infra.ApplicationYaml.OssCicv.BucketName, -1)
|
|
|
+ } else {
|
|
|
podString = strings.Replace(podString, "oss-type", infra.ApplicationYaml.OssPji.Type, -1)
|
|
|
podString = strings.Replace(podString, "oss-ip", infra.ApplicationYaml.OssPji.Endpoint, -1) // 不带http://前缀
|
|
|
podString = strings.Replace(podString, "oss-access-key", infra.ApplicationYaml.OssPji.AccessKeyId, -1)
|
