Skip to content
Merged
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -441,11 +441,19 @@ private void scaleDownKubernetesClusterSize() throws CloudRuntimeException {
if (this.nodeIds != null) {
vmList = getKubernetesClusterVMMapsForNodes(this.nodeIds).stream().filter(vm -> !vm.isExternalNode()).collect(Collectors.toList());
} else {
vmList = getKubernetesClusterVMMaps();
vmList = vmList.stream()
List<KubernetesClusterVmMapVO> workerVMsMap = getKubernetesClusterVMMaps().stream()
.filter(vm -> !vm.isExternalNode() && !vm.isControlNode() && !vm.isEtcdNode())
.collect(Collectors.toList());
vmList = vmList.subList((int) (kubernetesCluster.getControlNodeCount() + clusterSize - 1), vmList.size());
int totalWorkerNodes = workerVMsMap.size();
int desiredWorkerNodes = clusterSize == null ? (int) kubernetesCluster.getNodeCount() : clusterSize.intValue();
int toRemoveCount = Math.max(0, totalWorkerNodes - desiredWorkerNodes);
if (toRemoveCount == 0) {
logger.info("No nodes to remove from Kubernetes cluster: {}", kubernetesCluster);
return;
}

int startIndex = Math.max(0, totalWorkerNodes - toRemoveCount);
vmList = new ArrayList<>(workerVMsMap.subList(startIndex, totalWorkerNodes));
}
Collections.reverse(vmList);
removeNodesFromCluster(vmList);
Expand Down
Loading