Skip to content

Commit 2771ab7

Browse files
committed
Fix scaling for non existing previous offering per node type
1 parent 4875d15 commit 2771ab7

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,9 @@ protected Pair<Long, Long> calculateNewClusterCountAndCapacity(Long newWorkerSiz
223223
} else {
224224
long nodeCount = getNodeCountForType(nodeType, kubernetesCluster);
225225
Long existingOfferingId = getExistingOfferingIdForNodeType(nodeType, kubernetesCluster);
226+
if (existingOfferingId == null) {
227+
existingOfferingId = serviceOffering.getId();
228+
}
226229
ServiceOfferingVO previousOffering = serviceOfferingDao.findById(existingOfferingId);
227230
Pair<Long, Long> previousNodesCapacity = calculateNodesCapacity(previousOffering, nodeCount);
228231
if (WORKER == nodeType) {

ui/src/views/compute/CreateKubernetesCluster.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,11 +285,11 @@
285285
</a-form-item>
286286
<a-form-item v-if="form.advancedmode" name="etcdnodes" ref="etcdnodes">
287287
<template #label>
288-
<tooltip-label :title="$t('label.cks.cluster.etcd.nodes')" :tooltip="apiParams.controlnodes.description"/>
288+
<tooltip-label :title="$t('label.cks.cluster.etcd.nodes')" :tooltip="apiParams.etcdnodes.description"/>
289289
</template>
290290
<a-input
291291
v-model:value="form.etcdnodes"
292-
:placeholder="apiParams.controlnodes.description"/>
292+
:placeholder="apiParams.etcdnodes.description"/>
293293
</a-form-item>
294294
<a-form-item v-if="form.advancedmode && form.etcdnodes && form.etcdnodes > 0" name="etcdofferingid" ref="etcdofferingid">
295295
<template #label>

0 commit comments

Comments
 (0)