From de30f3b7ee21726e1e8aeaa3f87f00b700510fd9 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Thu, 29 Apr 2021 20:41:38 +0530 Subject: [PATCH] vmware cks: Guard k8s cluster root disk resize if no root disk size passed (#4957) * Guard k8s cluster resize if no root disk size passed * test regression Co-authored-by: Pearl Dsilva --- .../KubernetesClusterResourceModifierActionWorker.java | 4 +++- .../actionworkers/KubernetesClusterStartWorker.java | 8 ++++++-- test/integration/smoke/test_scale_vm.py | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java index 324143cffcf..17def806c33 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java +++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java @@ -328,7 +328,9 @@ public class KubernetesClusterResourceModifierActionWorker extends KubernetesClu for (int i = offset + 1; i <= nodeCount; i++) { UserVm vm = createKubernetesNode(publicIpAddress, i); addKubernetesClusterVm(kubernetesCluster.getId(), vm.getId()); - resizeNodeVolume(vm); + if (kubernetesCluster.getNodeRootDiskSize() > 0) { + resizeNodeVolume(vm); + } startKubernetesVM(vm); vm = userVmDao.findById(vm.getId()); if (vm == null) { diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java index 5855319ae67..4a96b9ed2ba 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java +++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java @@ -277,7 +277,9 @@ public class KubernetesClusterStartWorker extends KubernetesClusterResourceModif UserVm k8sMasterVM = null; k8sMasterVM = createKubernetesMaster(network, publicIpAddress); addKubernetesClusterVm(kubernetesCluster.getId(), k8sMasterVM.getId()); - resizeNodeVolume(k8sMasterVM); + if (kubernetesCluster.getNodeRootDiskSize() > 0) { + resizeNodeVolume(k8sMasterVM); + } startKubernetesVM(k8sMasterVM); k8sMasterVM = userVmDao.findById(k8sMasterVM.getId()); if (k8sMasterVM == null) { @@ -297,7 +299,9 @@ public class KubernetesClusterStartWorker extends KubernetesClusterResourceModif UserVm vm = null; vm = createKubernetesAdditionalMaster(publicIpAddress, i); addKubernetesClusterVm(kubernetesCluster.getId(), vm.getId()); - resizeNodeVolume(vm); + if (kubernetesCluster.getNodeRootDiskSize() > 0) { + resizeNodeVolume(vm); + } startKubernetesVM(vm); vm = userVmDao.findById(vm.getId()); if (vm == null) { diff --git a/test/integration/smoke/test_scale_vm.py b/test/integration/smoke/test_scale_vm.py index c58aabb90e6..2b2ced5ee34 100644 --- a/test/integration/smoke/test_scale_vm.py +++ b/test/integration/smoke/test_scale_vm.py @@ -58,7 +58,7 @@ class TestScaleVm(cloudstackTestCase): cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests()) cls.services['mode'] = cls.zone.networktype - if cls.hypervisor.lower() == 'simulator': + if cls.hypervisor.lower() in ['simulator', 'vmware']: cls.template = get_template( cls.apiclient, cls.zone.id,