wanjia9506
/
microservices
forked from Gitlink/microservices
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '新增Pod删除接口' (#934) from otto/microservices:dev_monitoring into dev_monitoring

This commit is contained in:
otto 2025-07-17 09:21:44 +08:00
parent e97b972f31 65a5b5d081
commit 4fd5c1cc4d
5 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/RemoteRancherService.java
View File

@ -63,4 +63,10 @@ public interface RemoteRancherService {
JSONObject getK8sServiceByApplicationId(@PathVariable("cluster_id") String cluster_id,
@PathVariable("nginxApplicationId") String nginxApplicationId,
@RequestHeader(TokenConstants.AUTHENTICATION) String token);
@DeleteMapping("/rancher/v1/pods/{namespace}/{podName}")
Response deletePod(@PathVariable("namespace") String namespace,
@PathVariable("podName") String podName,
@RequestBody JSONObject deletePodBody,
@RequestHeader(TokenConstants.AUTHENTICATION) String token);
}

5
microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/factory/RemoteRancherFallbackFactory.java
View File

@ -63,6 +63,11 @@ public class RemoteRancherFallbackFactory implements FallbackFactory<RemoteRanch
public JSONObject getK8sServiceByApplicationId(String cluster_id, String nginxApplicationId, String token) {
return null;
}
@Override
public Response deletePod(String namespace, String podName, JSONObject deletePodBody, String token) {
return null;
}
};
}
}

14
microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/controller/MicroManagementController.java
View File

@ -1,5 +1,7 @@
package com.microservices.mon.k8s.controller;
import com.microservices.common.core.web.controller.BaseController;
import com.microservices.common.core.web.domain.AjaxResult;
import com.microservices.common.core.web.domain.GenericsAjaxResult;
import com.microservices.common.core.web.page.GenericsTableDataInfo;
import com.microservices.mon.k8s.domain.K8sApplication;
@ -16,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("micro")
@Api(tags = "微服务管理")
public class MicroManagementController {
public class MicroManagementController extends BaseController {
@Autowired
private IMicroManagementService microManagementService;
@ -30,7 +32,7 @@ public class MicroManagementController {
@GetMapping("/pod/status/{containerID}")
public GenericsAjaxResult<K8sPodContainerMetric> podStatus(@PathVariable("containerID") String containerID,
@RequestParam(value = "step", required = false) @ApiParam(value = "统计频率") Long step) {
return GenericsAjaxResult.success(microManagementService.getPodStatus(containerID,step));
return GenericsAjaxResult.success(microManagementService.getPodStatus(containerID, step));
}
@ApiOperation(value = "获取微服务应用详情")
@ -40,4 +42,12 @@ public class MicroManagementController {
@PathVariable("applicationName") String applicationName) {
return GenericsAjaxResult.success(microManagementService.getApplicationDetail(kind, namespace, applicationName));
}
@ApiOperation(value = "删除POD容器")
@DeleteMapping("/pod/{namespace}/{podName}")
public AjaxResult applicationDetail(@PathVariable("namespace") String namespace,
@PathVariable("podName") String podName,
@RequestParam(value = "isForce", required = false) @ApiParam(value = "是否强制删除") Boolean isForce) {
return toAjax(microManagementService.deletePod(namespace, podName, isForce));
}
}

2
microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/service/IMicroManagementService.java
View File

@ -12,4 +12,6 @@ public interface IMicroManagementService {
K8sPodContainerMetric getPodStatus(String containerID, Long step);
K8sApplication getApplicationDetail(String kind, String namespace, String applicationName);
Boolean deletePod(String namespace, String podName, Boolean isForce);
}

14
microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/service/impl/MicroManagementServiceImpl.java
View File

@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSONObject;
import com.microservices.common.core.context.SecurityContextHolder;
import com.microservices.common.core.utils.DateUtils;
import com.microservices.common.core.utils.StringUtils;
import com.microservices.common.security.utils.SecurityUtils;
import com.microservices.mon.k8s.domain.*;
import com.microservices.mon.k8s.domain.vo.*;
import com.microservices.mon.k8s.service.IK8sDashboardService;
@ -15,6 +16,7 @@ import com.microservices.mon.k8s.utils.SkywalkingGQLConstant;
import com.microservices.system.api.RemoteGatewayService;
import com.microservices.system.api.RemoteRancherService;
import com.microservices.system.api.model.GraphqlQueryVo;
import feign.Response;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -71,4 +73,16 @@ public class MicroManagementServiceImpl extends CommonService implements IMicroM
}
return k8sApplication;
}
@Override
public Boolean deletePod(String namespace, String podName, Boolean isForce) {
JSONObject deletePodBody = new JSONObject();
if (isForce != null && isForce) {
deletePodBody.put("force", true);
deletePodBody.put("gracePeriod", 0);
}
try (Response response = remoteRancherService.deletePod(namespace, podName, deletePodBody, SecurityContextHolder.getUserKey())) {
return response != null && response.status() >= 200 && response.status() < 300;
}
}
}