This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.15
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.15 by this push:
new de30f3b vmware cks: Guard k8s cluster root disk resize if no root
disk size passed (#4957)
de30f3b is described below
commit de30f3b7ee21726e1e8aeaa3f87f00b700510fd9
Author: Pearl Dsilva <[email protected]>
AuthorDate: Thu Apr 29 20:41:38 2021 +0530
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 <[email protected]>
---
.../KubernetesClusterResourceModifierActionWorker.java | 4 +++-
.../cluster/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 324143c..17def80 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 5855319..4a96b9ed2 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 c58aabb..2b2ced5 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,
