Add NodePort and Loadbalancer to services web ui

Remove PublicIPs
lavalamp · Jun 15, 2015 · 90b0b5c · 90b0b5c
1 parent 19a7e87
commit 90b0b5c
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 68 deletions.
diff --git a/pkg/ui/datafile.go b/pkg/ui/datafile.go
diff --git a/www/app/assets/js/app.js b/www/app/assets/js/app.js
@@ -1729,7 +1729,7 @@ app.controller('ListServicesCtrl', [
                 var n = '';
                 if(p.name)
                   n = p.name + ': ';
-                 n = n + p.port;
+                n = n + p.port;
                 return n;
                }).join(', ');
             }

diff --git a/www/app/components/dashboard/views/replication.html b/www/app/components/dashboard/views/replication.html
@@ -63,7 +63,7 @@
               </div>
 
               <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>
             </td>
           </tr>

diff --git a/www/app/components/dashboard/views/service.html b/www/app/components/dashboard/views/service.html
@@ -31,6 +31,11 @@
                   {{port.name}}:
                 </span>
                 {{port.port}}/{{port.protocol}}
+
+                <div ng-show="port.nodePort && port.nodePort != 0">
+                  Node Port: {{port.nodePort}}/{{port.protocol}}
+                </div>
+
              </div>
             </td>
           </tr>
@@ -43,10 +48,12 @@
             </td>
           </tr>
 
-          <tr ng-show="service.spec.publicIPs">
-            <td class="name">Public IPs</td>
+          <tr ng-show="service.status.loadBalancer.ingress">
+            <td class="name">LoadBalancer Ingress</td>
             <td class="value">
-              {{service.spec.publicIPs | join:', '}}
+              <span ng-repeat="lb in service.status.loadBalancer.ingress">
+                {{lb.ip || lb.hostname}}{{$last ? '' : ', '}}
+              </span>
             </td>
           </tr>
 
@@ -75,7 +82,6 @@
             </td>
           </tr>
 
-
           <tr>
             <td class="name">Related Pods</td>
             <td class="value">

diff --git a/www/master/components/dashboard/js/modules/controllers/listServicesController.js b/www/master/components/dashboard/js/modules/controllers/listServicesController.js
@@ -86,7 +86,7 @@ app.controller('ListServicesCtrl', [
                 var n = '';
                 if(p.name)
                   n = p.name + ': ';
-                 n = n + p.port;
+                n = n + p.port;
                 return n;
                }).join(', ');
             }

diff --git a/www/master/components/dashboard/views/replication.html b/www/master/components/dashboard/views/replication.html
@@ -63,7 +63,7 @@
               </div>
 
               <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>
             </td>
           </tr>

diff --git a/www/master/components/dashboard/views/service.html b/www/master/components/dashboard/views/service.html
@@ -31,6 +31,11 @@
                   {{port.name}}:
                 </span>
                 {{port.port}}/{{port.protocol}}
+
+                <div ng-show="port.nodePort && port.nodePort != 0">
+                  Node Port: {{port.nodePort}}/{{port.protocol}}
+                </div>
+
              </div>
             </td>
           </tr>
@@ -43,10 +48,12 @@
             </td>
           </tr>
 
-          <tr ng-show="service.spec.publicIPs">
-            <td class="name">Public IPs</td>
+          <tr ng-show="service.status.loadBalancer.ingress">
+            <td class="name">LoadBalancer Ingress</td>
             <td class="value">
-              {{service.spec.publicIPs | join:', '}}
+              <span ng-repeat="lb in service.status.loadBalancer.ingress">
+                {{lb.ip || lb.hostname}}{{$last ? '' : ', '}}
+              </span>
             </td>
           </tr>
 
@@ -75,7 +82,6 @@
             </td>
           </tr>
 
-
           <tr>
             <td class="name">Related Pods</td>
             <td class="value">
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,7 +63,7 @@ @@
                   </div>
                   <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>
                 </td>
               </tr>
@@ Expand Down @@