github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(app): namespace selector fixes [EE-6561] (#10977)

pull/10981/head
Ali 2024-01-19 12:20:44 +13:00 committed by GitHub
parent a4739f1701
commit 5f040bf788
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/kubernetes/views/applications/create/createApplication.html
View File

@ -66,7 +66,7 @@
<namespace-selector <namespace-selector
values="ctrl.formValues.ResourcePool.Namespace.Name" values="ctrl.formValues.ResourcePool.Namespace.Name"
on-change="(ctrl.onChangeNamespaceName)" on-change="(ctrl.onChangeNamespaceName)"
validation-data="{hasQuota: ctrl.state.resourcePoolHasQuota, isResourceQuotaCapacityExceeded: ctrl.resourceQuotaCapacityExceeded(), namespaceOptionCount: ctrl.resourcePools.length, isEnvironmentAdmin: ctrl.state.isEnvironmentAdmin}" validation-data="{hasQuota: ctrl.state.resourcePoolHasQuota, isResourceQuotaCapacityExceeded: ctrl.resourceQuotaCapacityExceeded(), namespaceOptionCount: ctrl.resourcePools.length, isEnvironmentAdmin: ctrl.isAdmin}"
is-edit="ctrl.state.isEdit" is-edit="ctrl.state.isEdit"
></namespace-selector> ></namespace-selector>
<!-- kubernetes services options --> <!-- kubernetes services options -->
@ -325,6 +325,7 @@
<!-- #endregion --> <!-- #endregion -->
</div> </div>
<div class="mb-8" ng-if="ctrl.formValues.ResourcePool">
<placement-form-section <placement-form-section
ng-show="ctrl.formValues.DeploymentType === ctrl.ApplicationDeploymentTypes.Replicated" ng-show="ctrl.formValues.DeploymentType === ctrl.ApplicationDeploymentTypes.Replicated"
values="{placements: ctrl.formValues.Placements, placementType: ctrl.formValues.PlacementType}" values="{placements: ctrl.formValues.Placements, placementType: ctrl.formValues.PlacementType}"
@ -332,7 +333,6 @@
></placement-form-section> ></placement-form-section>
<!-- kubernetes services options --> <!-- kubernetes services options -->
<div class="mb-8" ng-if="ctrl.formValues.ResourcePool">
<kube-services-form <kube-services-form
on-change="(ctrl.onServicesChange)" on-change="(ctrl.onServicesChange)"
values="ctrl.formValues.Services" values="ctrl.formValues.Services"

7
app/react/kubernetes/applications/components/ResourceReservationFormSection/ResourceReservationFormSection.tsx
View File

@ -42,13 +42,6 @@ export function ResourceReservationFormSection({
application. Maximums are inherited from the namespace quota. application. Maximums are inherited from the namespace quota.
</TextTip> </TextTip>
)} )}
{namespaceHasQuota && resourceQuotaCapacityExceeded && (
<TextTip color="red">
This namespace has exhausted its resource capacity and you will not be
able to deploy the application. Contact your administrator to expand
the capacity of the namespace.
</TextTip>
)}
<FormControl <FormControl
className="flex flex-row" className="flex flex-row"
label="Memory limit (MB)" label="Memory limit (MB)"