(cloudstack) branch main updated: Enable dynamic scaling of Kubernetes cluster offerings for KVM (#13226)

[fabricio]

This is an automated email from the ASF dual-hosted git repository.

winterhazel pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/main by this push:
     new 5c4bc486d29 Enable dynamic scaling of Kubernetes cluster offerings for 
KVM (#13226)
5c4bc486d29 is described below

commit 5c4bc486d29362a6aac530d0534fe78b4b84a77b
Author: Bernardo De Marco Gonçalves <bernardomg2...@gmail.com>
AuthorDate: Wed Jul 1 17:26:57 2026 -0300

    Enable dynamic scaling of Kubernetes cluster offerings for KVM (#13226)
---
 .../actionworkers/KubernetesClusterScaleWorker.java       | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git 
a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterScaleWorker.java
 
b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterScaleWorker.java
index 78c183619f6..08513dbd448 100644
--- 
a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterScaleWorker.java
+++ 
b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterScaleWorker.java
@@ -44,7 +44,6 @@ import com.cloud.exception.ManagementServerException;
 import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.exception.VirtualMachineMigrationException;
-import com.cloud.hypervisor.Hypervisor;
 import com.cloud.kubernetes.cluster.KubernetesCluster;
 import com.cloud.kubernetes.cluster.KubernetesClusterManagerImpl;
 import com.cloud.kubernetes.cluster.KubernetesClusterService;
@@ -61,8 +60,6 @@ import com.cloud.utils.Pair;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.ssh.SshHelper;
 import com.cloud.vm.UserVmVO;
-import com.cloud.vm.VMInstanceVO;
-import com.cloud.vm.VirtualMachine;
 import org.apache.logging.log4j.Level;
 
 import static 
com.cloud.kubernetes.cluster.KubernetesServiceHelper.KubernetesClusterNodeType.CONTROL;
@@ -310,18 +307,8 @@ public class KubernetesClusterScaleWorker extends 
KubernetesClusterResourceModif
         }
         final long originalNodeCount = kubernetesCluster.getTotalNodeCount();
         List<KubernetesClusterVmMapVO> vmList = 
kubernetesClusterVmMapDao.listByClusterId(kubernetesCluster.getId());
-        if (vmList == null || vmList.isEmpty() || vmList.size() < 
originalNodeCount) {
+        if (CollectionUtils.isEmpty(vmList) || vmList.size() < 
originalNodeCount) {
             logTransitStateToFailedIfNeededAndThrow(Level.WARN, 
String.format("Scaling Kubernetes cluster : %s failed, it is in unstable state 
as not enough existing VM instances found!", kubernetesCluster.getName()));
-        } else {
-            for (KubernetesClusterVmMapVO vmMapVO : vmList) {
-                VMInstanceVO vmInstance = 
vmInstanceDao.findById(vmMapVO.getVmId());
-                if (vmInstance != null && 
vmInstance.getState().equals(VirtualMachine.State.Running) &&
-                        vmInstance.getHypervisorType() != 
Hypervisor.HypervisorType.XenServer &&
-                        vmInstance.getHypervisorType() != 
Hypervisor.HypervisorType.VMware &&
-                        vmInstance.getHypervisorType() != 
Hypervisor.HypervisorType.Simulator) {
-                    logTransitStateToFailedIfNeededAndThrow(Level.WARN, 
String.format("Scaling Kubernetes cluster : %s failed, scaling Kubernetes 
cluster with running VMs on hypervisor %s is not supported!", 
kubernetesCluster.getName(), vmInstance.getHypervisorType()));
-                }
-            }
         }
     }