Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-05 05:45:22 +02:00
Code Issues Releases Activity

fix(app): improve resource quota error handling [EE-5933] (#10951)

Browse source
This commit is contained in:
Ali 2024-01-15 13:29:35 +13:00 • committed by GitHub
parent 488fcc7cc5
commit 6d71a28584
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 122 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/kubernetes/models/application/models/constants.js
View file

@ -1,6 +1,6 @@
export const KubernetesApplicationQuotaDefaults = {
CpuLimit: 0.1,
MemoryLimit: 64, // MB
MemoryLimit: 128, // MB
};
export const KubernetesPortainerApplicationStackNameLabel = 'io.portainer.kubernetes.application.stack';

20
app/kubernetes/react/components/index.ts
View file

@ -7,7 +7,6 @@ import { NamespaceAccessUsersSelector } from '@/react/kubernetes/namespaces/Acce
import { RegistriesSelector } from '@/react/kubernetes/namespaces/components/RegistriesFormSection/RegistriesSelector';
import { KubeServicesForm } from '@/react/kubernetes/applications/CreateView/application-services/KubeServicesForm';
import { kubeServicesValidation } from '@/react/kubernetes/applications/CreateView/application-services/kubeServicesValidation';
import { AppDeploymentTypeFormSection } from '@/react/kubernetes/applications/CreateView/AppDeploymentTypeFormSection';
import { withReactQuery } from '@/react-tools/withReactQuery';
import { withUIRouter } from '@/react-tools/withUIRouter';
import {
@ -56,6 +55,8 @@ import {
NameFormSection,
appNameValidation,
} from '@/react/kubernetes/applications/components/NameFormSection';
import { deploymentTypeValidation } from '@/react/kubernetes/applications/components/AppDeploymentTypeFormSection/deploymentTypeValidation';
import { AppDeploymentTypeFormSection } from '@/react/kubernetes/applications/components/AppDeploymentTypeFormSection/AppDeploymentTypeFormSection';
import { EnvironmentVariablesFieldset } from '@@/form-components/EnvironmentVariablesFieldset';
@ -122,14 +123,6 @@ export const ngModule = angular
'persistedFoldersUseExistingVolumes',
])
)
.component(
'appDeploymentTypeFormSection',
r2a(AppDeploymentTypeFormSection, [
'value',
'onChange',
'supportGlobalDeployment',
])
)
.component(
'kubeYamlInspector',
r2a(withUIRouter(withReactQuery(withCurrentUser(YAMLInspector))), [
@ -333,3 +326,12 @@ withFormValidation(
appNameValidation,
true
);
withFormValidation(
ngModule,
AppDeploymentTypeFormSection,
'appDeploymentTypeFormSection',
['supportGlobalDeployment'],
deploymentTypeValidation,
true
);

5
app/kubernetes/views/applications/create/createApplication.html
View file

@ -294,16 +294,17 @@
namespace-has-quota="ctrl.state.resourcePoolHasQuota"
max-memory-limit="ctrl.state.sliders.memory.max"
max-cpu-limit="ctrl.state.sliders.cpu.max"
validation-data="{maxMemoryLimit: ctrl.state.sliders.memory.max, maxCpuLimit: ctrl.state.sliders.cpu.max}"
validation-data="{maxMemoryLimit: ctrl.state.sliders.memory.max, maxCpuLimit: ctrl.state.sliders.cpu.max, isEnvironmentAdmin: ctrl.state.isEnvironmentAdmin}"
resource-quota-capacity-exceeded="ctrl.resourceQuotaCapacityExceeded()"
></resource-reservation-form-section>
<!-- deployment options -->
<app-deployment-type-form-section
value="ctrl.formValues.DeploymentType"
values="ctrl.formValues.DeploymentType"
on-change="(ctrl.onChangeDeploymentType)"
support-global-deployment="ctrl.supportGlobalDeployment()"
radio-name="'deploymentType'"
validation-data="{isQuotaExceeded: ctrl.resourceReservationsOverflow()}"
></app-deployment-type-form-section>
<!-- replica count -->

20
app/kubernetes/views/applications/create/createApplicationController.js
View file

@ -994,13 +994,28 @@ class KubernetesCreateApplicationController {
this.state.nodes.cpu += item.CPU;
});
var namespace = '';
this.formValues.ResourcePool = this.resourcePools[0];
if (this.resourcePools.length) {
this.namespaceWithQuota = await this.KubernetesResourcePoolService.get(this.resourcePools[0].Namespace.Name);
if (this.state.isEdit) {
namespace = this.$state.params.namespace;
this.formValues.ResourcePool = _.find(this.resourcePools, ['Namespace.Name', namespace]);
}
namespace = this.formValues.ResourcePool.Namespace.Name;
this.namespaceWithQuota = await this.KubernetesResourcePoolService.get(namespace);
this.formValues.ResourcePool.Quota = this.namespaceWithQuota.Quota;
// this.savedFormValues is being used in updateNamespaceLimits behind a check to see isEdit
if (this.state.isEdit) {
this.savedFormValues = angular.copy(this.formValues);
}
this.updateNamespaceLimits(this.namespaceWithQuota);
this.updateSliders(this.namespaceWithQuota);
}
this.formValues.ResourcePool = this.resourcePools[0];
if (!this.formValues.ResourcePool) {
return;
}
@ -1008,7 +1023,6 @@ class KubernetesCreateApplicationController {
this.nodesLabels = KubernetesNodeHelper.generateNodeLabelsFromNodes(nodes);
this.nodeNumber = nodes.length;
const namespace = this.state.isEdit ? this.$state.params.namespace : this.formValues.ResourcePool.Namespace.Name;
await this.refreshNamespaceData(namespace);
if (this.state.isEdit) {