[ADD] 重置deploy-key时重启agent

Author: 李浩

src/main/java/io/choerodon/devops/app/service/AgentCommandService.java

@@ -110,4 +110,6 @@ void startOrStopInstance(String payload, String name,
      * @param configVO  配置信息
      */
     void sendChartMuseumAuthentication(Long clusterId, ConfigVO configVO);
+
+    void sendRestartAgent(Long clusterId);
 }

src/main/java/io/choerodon/devops/app/service/impl/AgentCommandServiceImpl.java

@@ -7,9 +7,6 @@
 
 import com.google.gson.Gson;
 import io.codearte.props2yaml.Props2YAML;
-import org.hzero.websocket.constant.ClientWebSocketConstant;
-import org.hzero.websocket.helper.KeySocketSendHelper;
-import org.hzero.websocket.vo.MsgVO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +41,10 @@
 import io.choerodon.devops.infra.mapper.DevopsClusterMapper;
 import io.choerodon.devops.infra.util.*;
 
+import org.hzero.websocket.constant.ClientWebSocketConstant;
+import org.hzero.websocket.helper.KeySocketSendHelper;
+import org.hzero.websocket.vo.MsgVO;
+
 
 /**
  * Created by younger on 2018/4/18.
@@ -65,7 +66,7 @@ public class AgentCommandServiceImpl implements AgentCommandService {
     private static final String OPERATE_POD_COUNT = "operate_pod_count";
     private static final String OPERATE_DOCKER_REGISTRY_SECRET = "operate_docker_registry_secret";
     private static final String CLUSTER_AGENT = "choerodon-cluster-agent-";
-
+    private static final String RESTART_AGENT = "restart_agent";
 
     private static final Pattern PATTERN = Pattern.compile("^[-+]?[\\d]*$");
     private static final Gson gson = new Gson();
@@ -446,4 +447,12 @@ public void sendChartMuseumAuthentication(Long clusterId, ConfigVO configVO) {
         sendToWebSocket(clusterId, msg);
         LOGGER.debug("Finished to sendChartMuseumAuthentication. cluster id {}", clusterId);
     }
+
+    @Override
+    public void sendRestartAgent(Long clusterId) {
+        AgentMsgVO msg = new AgentMsgVO();
+        msg.setType(RESTART_AGENT);
+        msg.setKey(String.format(CLUSTER_FORMAT, clusterId));
+        sendToWebSocket(clusterId, msg);
+    }
 }

src/main/java/io/choerodon/devops/infra/util/GitUtil.java

@@ -37,6 +37,7 @@
 import io.choerodon.devops.api.vo.GitConfigVO;
 import io.choerodon.devops.api.vo.GitEnvConfigVO;
 import io.choerodon.devops.api.vo.GitlabRepositoryInfo;
+import io.choerodon.devops.app.service.AgentCommandService;
 import io.choerodon.devops.app.service.DevopsClusterResourceService;
 import io.choerodon.devops.app.service.DevopsEnvironmentService;
 import io.choerodon.devops.infra.dto.DevopsClusterDTO;
@@ -80,6 +81,8 @@ public class GitUtil {
     private String gitlabInternalsshUrl;
     @Autowired
     private GitlabServiceClientOperator gitlabServiceClientOperator;
+    @Autowired
+    private AgentCommandService agentCommandService;
 
     public String getSshUrl() {
         if (org.apache.commons.lang3.StringUtils.isNotBlank(gitlabInternalsshUrl)) {
@@ -771,6 +774,8 @@ public static void refreshDeployKey(DevopsEnvironmentDTO devopsEnvironmentDTO) {
                 true,
                 GitUserNameUtil.getAdminId()
         );
+        // 通知agent进行重启
+        ApplicationContextHelper.getContext().getBean(AgentCommandService.class).sendRestartAgent(devopsEnvironmentDTO.getClusterId());
     }