apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 10:32:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent scaling of cluster if count / resources exceed account resource limits (#12167)

Browse Source
This commit is contained in:
Pearl Dsilva 2025-12-12 07:57:15 -05:00 committed by GitHub
parent 223fc2512c
commit 0a13fb27f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
View File

@ -47,6 +47,8 @@ import java.util.stream.Collectors;
import javax.inject.Inject; import javax.inject.Inject;
import javax.naming.ConfigurationException; import javax.naming.ConfigurationException;
import com.cloud.configuration.Resource;
import com.cloud.user.ResourceLimitService;
import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.acl.Role; import org.apache.cloudstack.acl.Role;
import org.apache.cloudstack.acl.RolePermissionEntity; import org.apache.cloudstack.acl.RolePermissionEntity;
@ -398,6 +400,8 @@ public class KubernetesClusterManagerImpl extends ManagerBase implements Kuberne
public ProjectManager projectManager; public ProjectManager projectManager;
@Inject @Inject
RoleService roleService; RoleService roleService;
@Inject
ResourceLimitService resourceLimitService;
private void logMessage(final Level logLevel, final String message, final Exception e) { private void logMessage(final Level logLevel, final String message, final Exception e) {
if (logLevel == Level.WARN) { if (logLevel == Level.WARN) {
@ -1341,8 +1345,58 @@ public class KubernetesClusterManagerImpl extends ManagerBase implements Kuberne
validateServiceOfferingsForNodeTypesScale(serviceOfferingNodeTypeMap, defaultServiceOfferingId, kubernetesCluster, clusterVersion); validateServiceOfferingsForNodeTypesScale(serviceOfferingNodeTypeMap, defaultServiceOfferingId, kubernetesCluster, clusterVersion);
validateKubernetesClusterScaleSize(kubernetesCluster, clusterSize, maxClusterSize, zone); 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);
}
}
protected void validateServiceOfferingsForNodeTypesScale(Map<String, Long> map, Long defaultServiceOfferingId, KubernetesClusterVO kubernetesCluster, KubernetesSupportedVersion clusterVersion) { protected void validateServiceOfferingsForNodeTypesScale(Map<String, Long> map, Long defaultServiceOfferingId, KubernetesClusterVO kubernetesCluster, KubernetesSupportedVersion clusterVersion) {
for (String key : CLUSTER_NODES_TYPES_LIST) { for (String key : CLUSTER_NODES_TYPES_LIST) {
Long serviceOfferingId = map.getOrDefault(key, defaultServiceOfferingId); Long serviceOfferingId = map.getOrDefault(key, defaultServiceOfferingId);