Skip to content

Commit 9f9e13c

Browse files
committed
Fix logic to update specific node entries for the CKS cluster
1 parent e673c8b commit 9f9e13c

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -557,27 +557,28 @@ public boolean scaleCluster() throws CloudRuntimeException {
557557
ServiceOffering existingServiceOffering = getExistingServiceOfferingForNodeType(nodeType, kubernetesCluster);
558558
ServiceOffering scalingServiceOffering = serviceOfferingNodeTypeMap.getOrDefault(nodeType.name(), defaultServiceOffering);
559559
boolean isNodeOfferingScalingNeeded = isServiceOfferingScalingNeededForNodeType(existingServiceOffering, scalingServiceOffering);
560+
boolean updateNodeOffering = serviceOfferingNodeTypeMap.containsKey(nodeType.name()) || isNodeOfferingScalingNeeded;
560561

561562
boolean updateClusterOffering = isWorkerNode && scaleClusterDefaultOffering;
562563
if (isWorkerNode && autoscalingChanged) {
563564
boolean autoScaled = autoscaleCluster(this.isAutoscalingEnabled, minSize, maxSize);
564565
if (autoScaled && isNodeOfferingScalingNeeded) {
565-
scaleKubernetesClusterOffering(nodeType, scalingServiceOffering, true, updateClusterOffering);
566+
scaleKubernetesClusterOffering(nodeType, scalingServiceOffering, updateNodeOffering, updateClusterOffering);
566567
}
567568
stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.OperationSucceeded);
568569
return autoScaled;
569570
}
570571
final boolean clusterSizeScalingNeeded = isWorkerNode && clusterSize != null && clusterSize != originalClusterSize;
571572
if (isNodeOfferingScalingNeeded && clusterSizeScalingNeeded) {
572573
if (newVMRequired > 0) {
573-
scaleKubernetesClusterOffering(nodeType, scalingServiceOffering, true, updateClusterOffering);
574+
scaleKubernetesClusterOffering(nodeType, scalingServiceOffering, updateNodeOffering, updateClusterOffering);
574575
scaleKubernetesClusterSize(nodeType);
575576
} else {
576577
scaleKubernetesClusterSize(nodeType);
577-
scaleKubernetesClusterOffering(nodeType, scalingServiceOffering, true, updateClusterOffering);
578+
scaleKubernetesClusterOffering(nodeType, scalingServiceOffering, updateNodeOffering, updateClusterOffering);
578579
}
579580
} else if (isNodeOfferingScalingNeeded) {
580-
scaleKubernetesClusterOffering(nodeType, scalingServiceOffering, true, updateClusterOffering);
581+
scaleKubernetesClusterOffering(nodeType, scalingServiceOffering, updateNodeOffering, updateClusterOffering);
581582
} else if (clusterSizeScalingNeeded) {
582583
scaleKubernetesClusterSize(nodeType);
583584
}

0 commit comments

Comments
 (0)