新集群

src/org/qg/docker/StageBucket.groovy

@@ -251,7 +251,7 @@ def deploy(namespace, systemName, imageTag, tier, isDeploy) {
     def deploy_job_info
     
     if (isDeploy=="true") {
-        _utils().beautyEcho("将镜像更新到到Namespace:" + namespace, "info")
+        _utils().beautyEcho("[旧集群][deploy]将镜像更新到到Namespace:" + namespace, "info")
         deploy_job_info = build job: '3.deployer.Updater', parameters: [
           string(name: 'namespace', value:"${namespace}"),
           string(name:'name', value: "${systemName}"),
@@ -265,6 +265,18 @@ def deploy(namespace, systemName, imageTag, tier, isDeploy) {
     }
 }
 
+def deployV2(namespace, systemName, imageTag, tier, isDeploy) {
+    def deploy_job_info
+    
+    if (isDeploy=="true") {
+        _utils().beautyEcho("[新集群][deployV2]将镜像更新到到Namespace:" + namespace, "info")
+		log = update_microservice(namespace, systemName, imageTag, tier)
+		return log
+    }else{
+        _utils().beautyEcho("namespace:[${namespace}]不存在，不执行deploy", "info")
+    }
+}
+
 def clean_images(imageTag) {
     sh "docker rmi -f \$(docker images -q ${imageTag})"
 }
@@ -278,4 +290,22 @@ def project_attr(systemName) {
     response = httpRequest "http://192.168.4.3:10088/config_server/get_project_attr/${systemName}"
     def res_json = jsonParse(response.content)
     return res_json
-}
\ No newline at end of file
+}
+
+def update_microservice(namespace, name, image, tier) {
+	dest_url = "http://192.168.4.24/api/qahome/update_microservice"
+	
+	j = {
+		"namespace": namespace,
+		"name": name,
+		"image": image,
+		"tier": tier
+	}
+	
+	response = httpRequest contentType: "APPLICATION_JSON", httpMode: "PUT", requestBody: JsonOutput.toJson(j), url: dest_url
+    def res_json = jsonParse(response.content)
+    return res_json
+}
+
+
+

vars/qgDockerPipeline.groovy

@@ -115,8 +115,14 @@ def call(body) {
 
                         stage('Deploy To K8s Cluster') {
                             _utils.beautyEcho("Deploy To K8s Cluster", "stage")
-                            def deploy_log = _stage.deploy(namespace, systemName, imageTag, config.tier, isDeploy)
-                            _utils.beautyEcho(deploy_log, "info")
+							
+							def deploy_log
+							if (config.cluster == "271") {
+								deploy_log = _stage.deployV2(namespace, systemName, imageTag, config.tier)
+							}else{
+	                            deploy_log = _stage.deploy(namespace, systemName, imageTag, config.tier, isDeploy)
+							}
+							_utils.beautyEcho(deploy_log, "info")
                         }
         
                         stage("Clean") {