Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 4.22
Choose a base branch
from
Open

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions ...etes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
import javax.inject.Inject;
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.Role;
import org.apache.cloudstack.acl.RolePermissionEntity;
Expand Down Expand Up @@ -398,6 +400,8 @@
public ProjectManager projectManager;
@Inject
RoleService roleService;
@Inject

Check warning on line 403 in plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove this field injection and use constructor injection instead. 


See more on https://sonarcloud.io/project/issues?id=apache_cloudstack&issues=AZrM43u_xWQNMKBQXj5o&open=AZrM43u_xWQNMKBQXj5o&pullRequest=12167
ResourceLimitService resourceLimitService;
Comment on lines +403 to +404
Copy link
Contributor

@DaanHoogland DaanHoogland Dec 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the sonar warning here is new to me. If we need to deal with this that is going to be a huge effort as this pattern is all over the project.


private void logMessage(final Level logLevel, final String message, final Exception e) {
if (logLevel == Level.WARN) {
Expand Down Expand Up @@ -1350,8 +1354,58 @@
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);
}
}


Copy link
Contributor

@DaanHoogland DaanHoogland Dec 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

protected void validateServiceOfferingsForNodeTypesScale(Map<String, Long> map, Long defaultServiceOfferingId, KubernetesClusterVO kubernetesCluster, KubernetesSupportedVersion clusterVersion) {
for (String key : CLUSTER_NODES_TYPES_LIST) {
Long serviceOfferingId = map.getOrDefault(key, defaultServiceOfferingId);
Expand Down
Loading