Skip to content

Commit 55ba389

Browse files
remove constraint from scaling k8s workflow
1 parent 67b849f commit 55ba389

1 file changed

Lines changed: 1 addition & 14 deletions

File tree

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterScaleWorker.java

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import com.cloud.exception.NetworkRuleConflictException;
4545
import com.cloud.exception.ResourceUnavailableException;
4646
import com.cloud.exception.VirtualMachineMigrationException;
47-
import com.cloud.hypervisor.Hypervisor;
4847
import com.cloud.kubernetes.cluster.KubernetesCluster;
4948
import com.cloud.kubernetes.cluster.KubernetesClusterManagerImpl;
5049
import com.cloud.kubernetes.cluster.KubernetesClusterService;
@@ -61,8 +60,6 @@
6160
import com.cloud.utils.exception.CloudRuntimeException;
6261
import com.cloud.utils.ssh.SshHelper;
6362
import com.cloud.vm.UserVmVO;
64-
import com.cloud.vm.VMInstanceVO;
65-
import com.cloud.vm.VirtualMachine;
6663
import org.apache.logging.log4j.Level;
6764

6865
import static com.cloud.kubernetes.cluster.KubernetesServiceHelper.KubernetesClusterNodeType.CONTROL;
@@ -310,18 +307,8 @@ private void validateKubernetesClusterScaleOfferingParameters() throws CloudRunt
310307
}
311308
final long originalNodeCount = kubernetesCluster.getTotalNodeCount();
312309
List<KubernetesClusterVmMapVO> vmList = kubernetesClusterVmMapDao.listByClusterId(kubernetesCluster.getId());
313-
if (vmList == null || vmList.isEmpty() || vmList.size() < originalNodeCount) {
310+
if (CollectionUtils.isEmpty(vmList) || vmList.size() < originalNodeCount) {
314311
logTransitStateToFailedIfNeededAndThrow(Level.WARN, String.format("Scaling Kubernetes cluster : %s failed, it is in unstable state as not enough existing VM instances found!", kubernetesCluster.getName()));
315-
} else {
316-
for (KubernetesClusterVmMapVO vmMapVO : vmList) {
317-
VMInstanceVO vmInstance = vmInstanceDao.findById(vmMapVO.getVmId());
318-
if (vmInstance != null && vmInstance.getState().equals(VirtualMachine.State.Running) &&
319-
vmInstance.getHypervisorType() != Hypervisor.HypervisorType.XenServer &&
320-
vmInstance.getHypervisorType() != Hypervisor.HypervisorType.VMware &&
321-
vmInstance.getHypervisorType() != Hypervisor.HypervisorType.Simulator) {
322-
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()));
323-
}
324-
}
325312
}
326313
}
327314

0 commit comments

Comments
 (0)