DaanHoogland commented on code in PR #12167:
URL: https://github.com/apache/cloudstack/pull/12167#discussion_r2576814088
##########
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java:
##########
@@ -1350,8 +1354,58 @@ private void
validateKubernetesClusterScaleParameters(ScaleKubernetesClusterCmd
validateServiceOfferingsForNodeTypesScale(serviceOfferingNodeTypeMap,
defaultServiceOfferingId, kubernetesCluster, clusterVersion);
validateKubernetesClusterScaleSize(kubernetesCluster, clusterSize,
maxClusterSize, zone);
+
+ ensureResourceLimitsForScale(kubernetesCluster,
serviceOfferingNodeTypeMap,
+ clusterSize != null ? clusterSize : null,
+ kubernetesCluster.getAccountId());
+ }
+
+ protected void ensureResourceLimitsForScale(final KubernetesClusterVO
cluster,
+ final Map<String, Long>
requestedServiceOfferingIds,
+ final Long targetNodeCounts,
+ final Long accountId) {
+
+ long totalAdditionalVms = 0L;
+ long totalAdditionalCpuUnits = 0L;
+ long totalAdditionalRamMb = 0L;
+
+
+ List<KubernetesClusterVmMapVO> clusterVmMapVOS =
kubernetesClusterVmMapDao.listByClusterIdAndVmType(cluster.getId(), WORKER);
+ long currentCount = clusterVmMapVOS != null ? clusterVmMapVOS.size() :
0L;
+ long desiredCount = targetNodeCounts != null ? targetNodeCounts :
currentCount;
+ long additional = Math.max(0L, desiredCount - currentCount);
+ if (additional == 0L) {
+ return;
+ }
+
+ Long offeringId = (requestedServiceOfferingIds != null &&
requestedServiceOfferingIds.containsKey(WORKER.name())) ?
+ requestedServiceOfferingIds.get(WORKER.name()) :
+ getExistingServiceOfferingIdForNodeType(WORKER.name(),
cluster);
+
+ if (offeringId == null) {
+ offeringId = cluster.getServiceOfferingId();
+ }
+
+ ServiceOffering so = serviceOfferingDao.findById(offeringId);
+ if (so == null) {
+ throw new InvalidParameterValueException(String.format("Invalid
service offering for node type %s", WORKER.name()));
+ }
+
+ totalAdditionalVms += additional;
+ long effectiveCpu = (long) so.getCpu() * so.getSpeed();
+ totalAdditionalCpuUnits += effectiveCpu * additional;
+ totalAdditionalRamMb += so.getRamSize() * additional;
+
+ try {
+
resourceLimitService.checkResourceLimit(accountDao.findById(accountId),
Resource.ResourceType.user_vm, totalAdditionalVms);
+
resourceLimitService.checkResourceLimit(accountDao.findById(accountId),
Resource.ResourceType.cpu, totalAdditionalCpuUnits);
+
resourceLimitService.checkResourceLimit(accountDao.findById(accountId),
Resource.ResourceType.memory, totalAdditionalRamMb);
+ } catch (Exception e) {
+ throw new CloudRuntimeException("Resource limits prevent scaling
the cluster: " + e.getMessage(), e);
+ }
}
+
Review Comment:
```suggestion
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
