Commit cd8ae161 authored by 智勇's avatar 智勇

up

parent ee8076d5
...@@ -76,7 +76,7 @@ def project_attr(systemName) { ...@@ -76,7 +76,7 @@ def project_attr(systemName) {
return res_json return res_json
} }
def update_microservice(namespace, name, image, tier,domain) { def update_microservice(namespace, name, image, tier, domain) {
dest_url = "http://172.30.220.22:3003/k8s/service/modifyImage" dest_url = "http://172.30.220.22:3003/k8s/service/modifyImage"
response = httpRequest httpMode:"POST", response = httpRequest httpMode:"POST",
...@@ -88,7 +88,7 @@ def update_microservice(namespace, name, image, tier,domain) { ...@@ -88,7 +88,7 @@ def update_microservice(namespace, name, image, tier,domain) {
"image":"${image}", "image":"${image}",
"label":"${tier}", "label":"${tier}",
"type":"${tier}", "type":"${tier}",
domain:'${domain}' "domain":"${domain}"
}""", }""",
url:dest_url url:dest_url
...@@ -560,13 +560,10 @@ def deploy(namespace, systemName, imageTag, tier, isDeploy) { ...@@ -560,13 +560,10 @@ def deploy(namespace, systemName, imageTag, tier, isDeploy) {
if (isDeploy=="true") { if (isDeploy=="true") {
def projectAttr = project_attr(systemName) def projectAttr = project_attr(systemName)
def host = projectAttr["host"] def host = projectAttr["host"]
echo "host is : ${host} "
def hostArray = host.split("\\.") def hostArray = host.split("\\.")
def hostFirst = hostArray[0]
echo "hostFirst is : ${hostFirst} "
imageTag = imageTag.replaceAll("ccr.ccs.tencentyun.com/","") imageTag = imageTag.replaceAll("ccr.ccs.tencentyun.com/","")
_utils().beautyEcho("[新集群][deployV2]将镜像更新到到Namespace:" + namespace, "info") _utils().beautyEcho("[新集群][deployV2]将镜像更新到到Namespace:" + namespace, "info")
update_microservice(namespace, systemName, imageTag, tier, hostFirst) update_microservice(namespace, systemName, imageTag, tier, hostArray[0])
} else { } else {
_utils().beautyEcho( "isDeploy == false,不执行deploy","info") _utils().beautyEcho( "isDeploy == false,不执行deploy","info")
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment