Skip to content

Fix external load balancer url detection logic #24

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

Merged
merged 1 commit into from
Nov 5, 2021
Merged

Fix external load balancer url detection logic #24

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

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions webui/src/js/utils/ingress-routes-helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,20 +512,28 @@ function(project, wktConsole, k8sHelper, i18n, projectIo, dialogHelper, validati
if (serviceDetail.spec['type'] === 'LoadBalancer' ||
(ingressControllerProvider === 'voyager' && serviceDetail.spec['type'] === 'NodePort')) {
if ('loadBalancer' in serviceDetail.status) {
if (JSON.stringify(serviceDetail.status['loadBalancer']) === '{}') {
if (JSON.stringify(serviceDetail.status.loadBalancer) === '{}') {
useNodePort = true;
if (typeof k8sCluster === 'undefined' || k8sCluster === '') {
externalLoadBalancerHost = '//<k8s cluster address>';
} else {
externalLoadBalancerHost = k8sCluster;
}
} else {
if ('hostname' in serviceDetail.status['loadBalancer'].ingress) {
externalLoadBalancerHost = '//' + serviceDetail.status['loadBalancer'].ingress.hostname;
} else if ('ip' in serviceDetail.status['loadBalancer'].ingress) {
externalLoadBalancerHost = '//' + serviceDetail.status['loadBalancer'].ingress.ip;
} else {
// should never be here...
let foundIngress = false;
if ('ingress' in serviceDetail.status.loadBalancer) {
const ing0 = serviceDetail.status.loadBalancer.ingress[0];
if ('hostname' in ing0 ) {
externalLoadBalancerHost = '//' + ing0.hostname;
foundIngress = true;
} else if ('ip' in ing0) {
externalLoadBalancerHost = '//' + ing0.ip;
foundIngress = true;
}
}

if (!foundIngress) {
// should never happen, just incase.
if (typeof k8sCluster === 'undefined' || k8sCluster === '') {
externalLoadBalancerHost = '//<k8s cluster address>';
} else {
Expand Down Expand Up @@ -558,9 +566,9 @@ function(project, wktConsole, k8sHelper, i18n, projectIo, dialogHelper, validati
}
} else {
if (ingressDefinition['tLSEnabled'] === true) {
results['accessPoint'] = 'https:' + externalLoadBalancerHost + '/' + ingressDefinition.path;
results['accessPoint'] = 'https:' + externalLoadBalancerHost + ingressDefinition.path;
} else {
results['accessPoint'] = 'http:' + externalLoadBalancerHost + '/' + ingressDefinition.path;
results['accessPoint'] = 'http:' + externalLoadBalancerHost + ingressDefinition.path;
}
}

Expand Down