Skip to content

add spiderViewK8sClusterDetail for checking cluster info #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Strato-YangSungHun merged 1 commit into from
Nov 5, 2025
Merged

add spiderViewK8sClusterDetail for checking cluster info #183

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 27 additions & 11 deletions src/main/java/kr/co/mcmp/softwarecatalog/kubernetes/service/KubernetesMonitoringService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,7 @@ private void handleK8sAutoscaling(DeploymentHistory deployment, ApplicationStatu
log.info("Redeployment completed for event: {}", latestPendingEvent.getId());

// 스케일 아웃 완료 알람 전송
log.info("===>>>> send alert message for scale out is completed ==");
sendScaleOutCompletedAlert(deployment, targetNodeCount);
} catch (Exception e) {
log.error("Error redeploying to new nodes: {}", e.getMessage(), e);
Expand Down Expand Up @@ -899,12 +900,17 @@ private int getCurrentDesiredNodeSize(DeploymentHistory deployment, KubernetesCl
K8sClusterDto clusterInfo = cbtumblebugRestApi.getK8sClusterByName(
deployment.getNamespace(), deployment.getClusterName());

if (clusterInfo != null && clusterInfo.getCspViewK8sClusterDetail() != null) {
List<K8sClusterDto.NodeGroup> nodeGroupList = clusterInfo.getCspViewK8sClusterDetail().getNodeGroupList();

if (clusterInfo != null) {
List<K8sClusterDto.NodeGroup> nodeGroupList = null;
if (clusterInfo.getSpiderViewK8sClusterDetail() != null) {
nodeGroupList = clusterInfo.getSpiderViewK8sClusterDetail().getNodeGroupList();
} else if (clusterInfo.getCspViewK8sClusterDetail() != null) {
nodeGroupList = clusterInfo.getCspViewK8sClusterDetail().getNodeGroupList();
}

if (nodeGroupList != null && deployment.getNodeGroupName() != null) {
for (K8sClusterDto.NodeGroup nodeGroup : nodeGroupList) {
if (nodeGroup.getIid() != null &&
if (nodeGroup.getIid() != null &&
nodeGroup.getIid().getNameId() != null &&
deployment.getNodeGroupName().equals(nodeGroup.getIid().getNameId())) {
log.info("Current desired node size from cluster info: {}", nodeGroup.getDesiredNodeSize());
Expand Down Expand Up @@ -1563,15 +1569,20 @@ private int getCurrentNodeCountFromCluster(String namespace, String clusterName,

log.info("Cluster info retrieved successfully: {}", clusterInfo.getName());

if (clusterInfo.getCspViewK8sClusterDetail() == null) {
log.error("CspViewK8sClusterDetail is null for cluster: {}", clusterName);
if (clusterInfo.getSpiderViewK8sClusterDetail() == null && clusterInfo.getCspViewK8sClusterDetail() == null) {
log.error("SpiderViewK8sClusterDetail and CspViewK8sClusterDetail are null for cluster: {}", clusterName);
log.warn("Will use default node count: {}", defaultNodeCount);
return defaultNodeCount;
}

log.info("CspViewK8sClusterDetail retrieved successfully");

List<K8sClusterDto.NodeGroup> nodeGroups = clusterInfo.getCspViewK8sClusterDetail().getNodeGroupList();
List<K8sClusterDto.NodeGroup> nodeGroups = null;
if (clusterInfo.getSpiderViewK8sClusterDetail() != null) {
nodeGroups = clusterInfo.getSpiderViewK8sClusterDetail().getNodeGroupList();
} else if (clusterInfo.getCspViewK8sClusterDetail() != null) {
nodeGroups = clusterInfo.getCspViewK8sClusterDetail().getNodeGroupList();
}

log.info("Node groups found: {}", nodeGroups != null ? nodeGroups.size() : 0);

Expand Down Expand Up @@ -1628,10 +1639,15 @@ public List<String> getNewlyCreatedNodes(ScalingEvent event, KubernetesClient cl
try {
K8sClusterDto clusterInfo = cbtumblebugRestApi.getK8sClusterByName(
event.getNamespace(), event.getClusterName());

if (clusterInfo != null && clusterInfo.getCspViewK8sClusterDetail() != null) {
List<K8sClusterDto.NodeGroup> nodeGroups = clusterInfo.getCspViewK8sClusterDetail().getNodeGroupList();


if (clusterInfo != null) {
List<K8sClusterDto.NodeGroup> nodeGroups = null;
if (clusterInfo.getSpiderViewK8sClusterDetail() != null) {
nodeGroups = clusterInfo.getSpiderViewK8sClusterDetail().getNodeGroupList();
} else if (clusterInfo.getCspViewK8sClusterDetail() != null) {
nodeGroups = clusterInfo.getCspViewK8sClusterDetail().getNodeGroupList();
}

if (nodeGroups != null) {
for (K8sClusterDto.NodeGroup nodeGroup : nodeGroups) {
String groupName = nodeGroup.getIid().getNameId();
Expand Down
Loading