From 55ba389cf081a0084434863fb630bfacae167492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernardo=20De=20Marco=20Gon=C3=A7alves?= Date: Fri, 22 May 2026 17:19:16 -0300 Subject: [PATCH] remove constraint from scaling k8s workflow --- .../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 78c183619f6b..08513dbd4487 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.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.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 @@ private void validateKubernetesClusterScaleOfferingParameters() throws CloudRunt } final long originalNodeCount = kubernetesCluster.getTotalNodeCount(); List 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())); - } - } } }