Merge pull request #105 from hyun357123/main

cbtumblebug k8sCluster api update
m-cmp · Jan 15, 2025 · 287556b · 287556b
2 parents 0eda045 + c30f214
commit 287556b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/kr/co/mcmp/ape/cbtumblebug/api/CbtumblebugRestApi.java b/src/main/java/kr/co/mcmp/ape/cbtumblebug/api/CbtumblebugRestApi.java
@@ -230,7 +230,7 @@ public MciAccessInfoDto getSSHKeyForMci(String namespace, String mciId) {
     public List<K8sClusterDto> getAllK8sClusters(String namespace){
         log.info("Fetching K8s Clusters by namespace: {}", namespace);
         return executeWithConnectionCheck("getK8sClustersByNamespace", () -> {
-            String apiUrl = createApiUrl(String.format("/tumblebug/ns/%s/k8scluster", namespace));
+            String apiUrl = createApiUrl(String.format("/tumblebug/ns/%s/k8sCluster", namespace));
             HttpHeaders headers = createCommonHeaders();
             ResponseEntity<K8sClusterResponse> response = restClient.request(
                 apiUrl, 
@@ -246,7 +246,7 @@ public List<K8sClusterDto> getAllK8sClusters(String namespace){
     public K8sClusterDto getK8sClusterByName(String namespace, String clusterName){
         log.info("Fetching K8s Cluster by name: {} in namespace: {}", clusterName, namespace);
         return executeWithConnectionCheck("getK8sClusterByName", () -> {
-            String apiUrl = createApiUrl(String.format("/tumblebug/ns/%s/k8scluster/%s", namespace, clusterName));
+            String apiUrl = createApiUrl(String.format("/tumblebug/ns/%s/k8sCluster/%s", namespace, clusterName));
             HttpHeaders headers = createCommonHeaders();
             ResponseEntity<K8sClusterDto> response = restClient.request(
                 apiUrl, 

diff --git a/src/main/java/kr/co/mcmp/softwarecatalog/docker/service/DockerMonitoringService.java b/src/main/java/kr/co/mcmp/softwarecatalog/docker/service/DockerMonitoringService.java
@@ -55,7 +55,7 @@ public void monitorContainerHealth() {
 
     private List<DeploymentHistory> getActiveDeployments() {
         return deploymentHistoryRepository.findAll().stream()
-                .filter(d -> DeploymentType.DOCKER.equals(d.getDeploymentType()))
+                .filter(d -> DeploymentType.VM.equals(d.getDeploymentType()))
                 .collect(Collectors.groupingBy(d -> d.getVmId() != null ? d.getVmId() : d.getMciId()))
                 .values().stream()
                 .flatMap(deployments -> deployments.stream()

diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -66,7 +66,7 @@ aes:
   key: fb1755281b0ca6184a0ee644e6477ee7
 
 cbtumblebug:
-  url: ${TUMBLEBUG_URL:210.217.178.130}
+  url: ${TUMBLEBUG_URL:mc-infra-manager}
   port: ${TUMBLEBUG_PORT:1323}
   id: ${TUMBLEBUG_ID:default}
   pass: ${TUMBLEBUG_PASSWORD:default}