Commit dfdbb32f authored by 黎博's avatar 黎博

修复jenkins打包mock和debug问题

parent f9c3ef57
...@@ -12,8 +12,7 @@ import com.alibaba.fastjson.JSON; ...@@ -12,8 +12,7 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.tencentcloudapi.tcr.v20190924.models.RepoInfo; import com.tencentcloudapi.tcr.v20190924.models.RepoInfo;
import com.tencentcloudapi.tcr.v20190924.models.TagInfo; import com.tencentcloudapi.tcr.v20190924.models.TagInfo;
import io.fabric8.kubernetes.api.model.Namespace; import io.fabric8.kubernetes.api.model.*;
import io.fabric8.kubernetes.api.model.ServicePort;
import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.apps.Deployment;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -268,6 +267,20 @@ public class K8sController { ...@@ -268,6 +267,20 @@ public class K8sController {
// 创建Deployment // 创建Deployment
if (k8sService.queryIfDeploymentExistByName(namespace, serviceName)) { if (k8sService.queryIfDeploymentExistByName(namespace, serviceName)) {
Deployment deployment = k8sService.getDeployment(namespace, serviceName);
List<Container> containers = deployment.getSpec().getTemplate().getSpec().getContainers();
if (containers != null && containers.size() > 0) {
List<EnvVar> envVarList = containers.get(0).getEnv();
// 根据原来的debug和mock值,来设置debug和mock
for (EnvVar envVar: envVarList) {
if (envVar.getName().equals("DEBUG")) {
serviceCreateVo.setDebug(Integer.valueOf(envVar.getValue()));
}
if (envVar.getName().equals("MOCK")) {
serviceCreateVo.setMock(Integer.valueOf((envVar.getValue())));
}
}
}
log.info("{}环境{}服务的Deployment已存在,首先删除该Deployment.", namespace, serviceName); log.info("{}环境{}服务的Deployment已存在,首先删除该Deployment.", namespace, serviceName);
k8sService.deleteDeployment(namespace, serviceName); k8sService.deleteDeployment(namespace, serviceName);
} }
......
...@@ -2315,6 +2315,16 @@ public class K8sService { ...@@ -2315,6 +2315,16 @@ public class K8sService {
return kubernetesClient.services().inNamespace(namespace).withName(serviceName).delete(); return kubernetesClient.services().inNamespace(namespace).withName(serviceName).delete();
} }
/**
* 获取Deployment
* @param namespace
* @param serviceName
* @return
*/
public Deployment getDeployment(String namespace, String serviceName) {
return kubernetesClient.apps().deployments().inNamespace(namespace).withName(serviceName).get();
}
public void podTest() { public void podTest() {
Map<String, String> labels = new HashMap<>(); Map<String, String> labels = new HashMap<>();
labels.put("qcloud-app", "mysql"); labels.put("qcloud-app", "mysql");
......
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