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

fix(k8s/application): validate load balancer ports inputs (#4426) 

* fix(k8s/application): validate load balancer ports inputs

* fix(k8s/application): allow user to only change the protocol on the first port mapping
pull/4588/head
Alice Groux 2021-01-15 02:51:36 +01:00 committed by GitHub
parent 7a03351df8
commit 121d33538d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 3 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

@ -1353,7 +1353,7 @@
class="btn btn-primary" class="btn btn-primary"
ng-model="publishedPort.Protocol" ng-model="publishedPort.Protocol"
uib-btn-radio="'TCP'" uib-btn-radio="'TCP'"
ng-change="ctrl.onChangePortMappingContainerPort()" ng-change="ctrl.onChangePortProtocol($index)"
ng-disabled="ctrl.isProtocolOptionDisabled($index, 'TCP')" ng-disabled="ctrl.isProtocolOptionDisabled($index, 'TCP')"
>TCP</label >TCP</label
> >
@ -1361,7 +1361,7 @@
class="btn btn-primary" class="btn btn-primary"
ng-model="publishedPort.Protocol" ng-model="publishedPort.Protocol"
uib-btn-radio="'UDP'" uib-btn-radio="'UDP'"
ng-change="ctrl.onChangePortMappingContainerPort()" ng-change="ctrl.onChangePortProtocol($index)"
ng-disabled="ctrl.isProtocolOptionDisabled($index, 'UDP')" ng-disabled="ctrl.isProtocolOptionDisabled($index, 'UDP')"
>UDP</label >UDP</label
> >

29
app/kubernetes/views/applications/create/createApplicationController.js
View File

@ -303,6 +303,9 @@ class KubernetesCreateApplicationController {
const ingresses = this.filteredIngresses; const ingresses = this.filteredIngresses;
p.IngressName = ingresses && ingresses.length ? ingresses[0].Name : undefined; p.IngressName = ingresses && ingresses.length ? ingresses[0].Name : undefined;
p.IngressHost = ingresses && ingresses.length ? ingresses[0].Host : undefined; p.IngressHost = ingresses && ingresses.length ? ingresses[0].Host : undefined;
if (this.formValues.PublishedPorts.length) {
p.Protocol = this.formValues.PublishedPorts[0].Protocol;
}
this.formValues.PublishedPorts.push(p); this.formValues.PublishedPorts.push(p);
} }
@ -335,6 +338,7 @@ class KubernetesCreateApplicationController {
this.onChangePortMappingNodePort(); this.onChangePortMappingNodePort();
this.onChangePortMappingIngressRoute(); this.onChangePortMappingIngressRoute();
this.onChangePortMappingLoadBalancer(); this.onChangePortMappingLoadBalancer();
this.onChangePortProtocol();
} }
onChangePortMappingContainerPort() { onChangePortMappingContainerPort() {
@ -403,6 +407,16 @@ class KubernetesCreateApplicationController {
state.hasDuplicates = false; state.hasDuplicates = false;
} }
} }
onChangePortProtocol(index) {
this.onChangePortMappingContainerPort();
if (this.formValues.PublishingType === KubernetesApplicationPublishingTypes.LOAD_BALANCER) {
const newPorts = _.filter(this.formValues.PublishedPorts, { IsNew: true });
_.forEach(newPorts, (port) => {
port.Protocol = index ? this.formValues.PublishedPorts[index].Protocol : newPorts[0].Protocol;
});
}
}
/* #endregion */ /* #endregion */
/* #region STATE VALIDATION FUNCTIONS */ /* #region STATE VALIDATION FUNCTIONS */
@ -561,6 +575,10 @@ class KubernetesCreateApplicationController {
return this.state.isEdit && !this.formValues.Placements[index].IsNew; return this.state.isEdit && !this.formValues.Placements[index].IsNew;
} }
isNewAndNotFirst(index) {
return !this.state.isEdit && index !== 0;
}
showPlacementPolicySection() { showPlacementPolicySection() {
const placements = _.filter(this.formValues.Placements, { NeedsDeletion: false }); const placements = _.filter(this.formValues.Placements, { NeedsDeletion: false });
return placements.length !== 0; return placements.length !== 0;
@ -600,8 +618,17 @@ class KubernetesCreateApplicationController {
return this.state.isEdit && this.formValues.PublishedPorts.length > 0 && ports.length > 0; return this.state.isEdit && this.formValues.PublishedPorts.length > 0 && ports.length > 0;
} }
isEditLBWithPorts() {
return this.formValues.PublishingType === KubernetesApplicationPublishingTypes.LOAD_BALANCER && _.filter(this.formValues.PublishedPorts, { IsNew: false }).length;
}
isProtocolOptionDisabled(index, protocol) { isProtocolOptionDisabled(index, protocol) {
return this.disableLoadBalancerEdit() || (this.isEditAndNotNewPublishedPort(index) && this.formValues.PublishedPorts[index].Protocol !== protocol); return (
this.disableLoadBalancerEdit() ||
(this.isEditAndNotNewPublishedPort(index) && this.formValues.PublishedPorts[index].Protocol !== protocol) ||
(this.isEditLBWithPorts() && this.formValues.PublishedPorts[index].Protocol !== protocol) ||
(this.isNewAndNotFirst(index) && this.formValues.PublishedPorts[index].Protocol !== protocol)
);
} }
/* #endregion */ /* #endregion */