Skip to content

K
k3s
Commit 1874599c authored by Jeff Lowdermilk's avatar Jeff Lowdermilk
Browse files
Options

Merge pull request #8947 from bcbroussard/services-nodeport

Update the services web ui for nodeport and loadbalancer
parents 5726ca55 90b0b5c8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 12 deletions
www/app/assets/js/app.js
View file @ 1874599c
...@@ -1729,7 +1729,7 @@ app.controller('ListServicesCtrl', [ ...@@ -1729,7 +1729,7 @@ app.controller('ListServicesCtrl', [
var n = ''; var n = '';
if(p.name) if(p.name)
n = p.name + ': '; n = p.name + ': ';
n = n + p.port; n = n + p.port;
return n; return n;
}).join(', '); }).join(', ');
} }
......
www/app/components/dashboard/views/replication.html
View file @ 1874599c
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</div> </div>
<div ng-repeat="(label, value) in replicationController.spec.selector"> <div ng-repeat="(label, value) in replicationController.spec.selector">
<a ng-href="#/dashboard/groups/type/selector/{{label}}={{value}},type=pod">{{label}}={{value}}</a> <a ng-href="#/dashboard/groups/type/selector/{{label}}={{value}},type=pod">{{label}}: {{value}}</a>
</div> </div>
</td> </td>
</tr> </tr>
......
www/app/components/dashboard/views/service.html
View file @ 1874599c
...@@ -31,6 +31,11 @@ ...@@ -31,6 +31,11 @@
{{port.name}}: {{port.name}}:
</span> </span>
{{port.port}}/{{port.protocol}} {{port.port}}/{{port.protocol}}
<div ng-show="port.nodePort && port.nodePort != 0">
Node Port: {{port.nodePort}}/{{port.protocol}}
</div>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -43,10 +48,12 @@ ...@@ -43,10 +48,12 @@
</td> </td>
</tr> </tr>
<tr ng-show="service.spec.publicIPs"> <tr ng-show="service.status.loadBalancer.ingress">
<td class="name">Public IPs</td> <td class="name">LoadBalancer Ingress</td>
<td class="value"> <td class="value">
{{service.spec.publicIPs | join:', '}} <span ng-repeat="lb in service.status.loadBalancer.ingress">
{{lb.ip || lb.hostname}}{{$last ? '' : ', '}}
</span>
</td> </td>
</tr> </tr>
...@@ -75,7 +82,6 @@ ...@@ -75,7 +82,6 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="name">Related Pods</td> <td class="name">Related Pods</td>
<td class="value"> <td class="value">
......
www/master/components/dashboard/js/modules/controllers/listServicesController.js
View file @ 1874599c
...@@ -86,7 +86,7 @@ app.controller('ListServicesCtrl', [ ...@@ -86,7 +86,7 @@ app.controller('ListServicesCtrl', [
var n = ''; var n = '';
if(p.name) if(p.name)
n = p.name + ': '; n = p.name + ': ';
n = n + p.port; n = n + p.port;
return n; return n;
}).join(', '); }).join(', ');
} }
......
www/master/components/dashboard/views/replication.html
View file @ 1874599c
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</div> </div>
<div ng-repeat="(label, value) in replicationController.spec.selector"> <div ng-repeat="(label, value) in replicationController.spec.selector">
<a ng-href="#/dashboard/groups/type/selector/{{label}}={{value}},type=pod">{{label}}={{value}}</a> <a ng-href="#/dashboard/groups/type/selector/{{label}}={{value}},type=pod">{{label}}: {{value}}</a>
</div> </div>
</td> </td>
</tr> </tr>
......
www/master/components/dashboard/views/service.html
View file @ 1874599c
...@@ -31,6 +31,11 @@ ...@@ -31,6 +31,11 @@
{{port.name}}: {{port.name}}:
</span> </span>
{{port.port}}/{{port.protocol}} {{port.port}}/{{port.protocol}}
<div ng-show="port.nodePort && port.nodePort != 0">
Node Port: {{port.nodePort}}/{{port.protocol}}
</div>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -43,10 +48,12 @@ ...@@ -43,10 +48,12 @@
</td> </td>
</tr> </tr>
<tr ng-show="service.spec.publicIPs"> <tr ng-show="service.status.loadBalancer.ingress">
<td class="name">Public IPs</td> <td class="name">LoadBalancer Ingress</td>
<td class="value"> <td class="value">
{{service.spec.publicIPs | join:', '}} <span ng-repeat="lb in service.status.loadBalancer.ingress">
{{lb.ip || lb.hostname}}{{$last ? '' : ', '}}
</span>
</td> </td>
</tr> </tr>
...@@ -75,7 +82,6 @@ ...@@ -75,7 +82,6 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="name">Related Pods</td> <td class="name">Related Pods</td>
<td class="value"> <td class="value">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment