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

fix(k8s):fix difficulties selecting mixed protocols when creating k8s application EE-1073 (#5591) 

* fix difficulties selecting mixed protocols when creating k8s application
pull/5698/head
Richard Wei 2021-09-21 16:20:22 +12:00 committed by GitHub
parent ecc9813750
commit deecbadce1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1304,7 +1304,7 @@
When publishing a port in cluster mode, the node port is optional. If left empty Kubernetes will use a random port number. If you wish to specify a port, use a When publishing a port in cluster mode, the node port is optional. If left empty Kubernetes will use a random port number. If you wish to specify a port, use a
port number inside the default range <code>30000-32767</code>. port number inside the default range <code>30000-32767</code>.
</div> </div>
<div ng-if="ctrl.isNotInternalAndHasNoPublishedPorts()" class="col-sm-12 small text-muted text-warning" style="margin-top: 12px;"> <div ng-if="ctrl.isNotInternalAndHasNoPublishedPorts()" class="col-sm-12 small text-warning" style="margin-top: 12px;">
<i class="fa fa-exclamation-triangle" aria-hidden="true"></i> At least one published port must be defined. <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> At least one published port must be defined.
</div> </div>

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

@ -790,15 +790,14 @@ class KubernetesCreateApplicationController {
} }
isEditLBWithPorts() { isEditLBWithPorts() {
return this.formValues.PublishingType === KubernetesApplicationPublishingTypes.LOAD_BALANCER && _.filter(this.formValues.PublishedPorts, { IsNew: false }).length; return this.formValues.PublishingType === KubernetesApplicationPublishingTypes.LOAD_BALANCER && _.filter(this.formValues.PublishedPorts, { IsNew: false }).length === 0;
} }
isProtocolOptionDisabled(index, protocol) { isProtocolOptionDisabled(index, protocol) {
return ( return (
this.disableLoadBalancerEdit() || this.disableLoadBalancerEdit() ||
(this.isEditAndNotNewPublishedPort(index) && this.formValues.PublishedPorts[index].Protocol !== protocol) || (this.isEditAndNotNewPublishedPort(index) && this.formValues.PublishedPorts[index].Protocol !== protocol) ||
(this.isEditLBWithPorts() && this.formValues.PublishedPorts[index].Protocol !== protocol) || (this.isEditLBWithPorts() && this.formValues.PublishedPorts[index].Protocol !== protocol && this.isNewAndNotFirst(index))
(this.isNewAndNotFirst(index) && this.formValues.PublishedPorts[index].Protocol !== protocol)
); );
} }