| Created | - {{service.creationTimestamp | date:'medium'}} + {{service.metadata.creationTimestamp | date:'medium'}} | |
| Port | +Ports |
- {{service.port}}
+
+
+ {{port.name}}:
+
+ {{port.port}}/{{port.protocol}}
+
|
| Container Port | +IP | - {{service.containerPort}} + {{service.spec.portalIP}} |
| Portal IP | +||
| Public IPs | - {{service.portalIP}} - | -|
| Protocol | -- {{service.protocol}} + {{service.spec.publicIPs | join:', '}} | |
| Session Affinity | - {{service.sessionAffinity}} + {{service.spec.sessionAffinity}} | |
| Labels |
-
+
{{label}}: {{value}}
|
|
| Selector | ++ + {{label}}={{value}}{{$last ? '' : ', '}} + + | +|
| Related Pods | - | Related Replication Controllers | - | @@ -5948,7 +5962,7 @@ func www_app_components_dashboard_views_service_html() (*asset, error) { return nil, err } - info := bindata_file_info{name: "www/app/components/dashboard/views/service.html", size: 2477, mode: os.FileMode(420), modTime: time.Unix(1432768981, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/views/service.html", size: 3539, mode: os.FileMode(420), modTime: time.Unix(1432831811, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -6025,7 +6039,7 @@ func www_app_index_html() (*asset, error) { return nil, err } - info := bindata_file_info{name: "www/app/index.html", size: 2315, mode: os.FileMode(420), modTime: time.Unix(1432754009, 0)} + info := bindata_file_info{name: "www/app/index.html", size: 2315, mode: os.FileMode(420), modTime: time.Unix(1432773208, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -6212,7 +6226,7 @@ func www_app_views_partials_md_table_tmpl_html() (*asset, error) { return nil, err } - info := bindata_file_info{name: "www/app/views/partials/md-table.tmpl.html", size: 2819, mode: os.FileMode(420), modTime: time.Unix(1432754009, 0)} + info := bindata_file_info{name: "www/app/views/partials/md-table.tmpl.html", size: 2819, mode: os.FileMode(420), modTime: time.Unix(1432773208, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/www/app/assets/js/app.js b/www/app/assets/js/app.js index d7630a67fe9..7bf960b9048 100644 --- a/www/app/assets/js/app.js +++ b/www/app/assets/js/app.js @@ -1700,7 +1700,7 @@ app.controller('ListServicesCtrl', [ '$scope', '$interval', '$routeParams', - 'k8sApi', + 'k8sv1Beta3Api', '$rootScope', '$location', function($scope, $interval, $routeParams, k8sApi, $rootScope, $location) { @@ -1712,7 +1712,7 @@ app.controller('ListServicesCtrl', [ {name: 'Labels', field: 'labels'}, {name: 'Selector', field: 'selector'}, {name: 'IP', field: 'ip'}, - {name: 'Port', field: 'port'} + {name: 'Ports', field: 'port'} ]; $scope.custom = { @@ -1760,41 +1760,36 @@ app.controller('ListServicesCtrl', [ if (data.items.constructor === Array) { data.items.forEach(function(service) { - var _name = '', _uses = '', _component = '', _provider = ''; + var _labels = ''; - if (service.labels !== null && typeof service.labels === 'object') { - Object.keys(service.labels) - .forEach(function(key) { - if (key == 'name') { - _name += ',' + service.labels[key]; - } - if (key == 'component') { - _component += ',' + service.labels[key]; - } - if (key == 'provider') { - _provider += ',' + service.labels[key]; - } - }); + if (service.metadata.labels) { + _labels = _.map(service.metadata.labels, function(v, k) { return k + '=' + v }).join(', '); } var _selectors = ''; - if (service.selector !== null && typeof service.selector === 'object') { - Object.keys(service.selector) - .forEach(function(key) { - if (key == 'name') { - _selectors += ',' + service.selector[key]; - } - }); + if (service.spec.selector) { + _selectors = _.map(service.spec.selector, function(v, k) { return k + '=' + v }).join(', '); + } + + var _ports = ''; + + if (service.spec.ports) { + _ports = _.map(service.spec.ports, function(p) { + var n = ''; + if(p.name) + n = p.name + ': '; + n = n + p.port; + return n; + }).join(', '); } $scope.content.push({ - name: service.id, - ip: service.portalIP, - port: service.port, - selector: addLabel(_fixComma(_selectors), 'name='), - labels: addLabel(_fixComma(_name), 'name=') + ' ' + addLabel(_fixComma(_component), 'component=') + ' ' + - addLabel(_fixComma(_provider), 'provider=') + name: service.metadata.name, + ip: service.spec.portalIP, + port: _ports, + selector: _selectors, + labels: _labels }); }); } @@ -1933,7 +1928,7 @@ ServiceController.prototype.handleError = function(data, status, headers, config app.controller('ServiceCtrl', [ '$scope', '$routeParams', - 'k8sApi', + 'k8sv1Beta3Api', '$location', function($scope, $routeParams, k8sApi, $location) { $scope.controller = new ServiceController(); @@ -1942,6 +1937,8 @@ app.controller('ServiceCtrl', [ $scope.controller.getData($routeParams.serviceId); $scope.doTheBack = function() { window.history.back(); }; + $scope.go = function(d) { $location.path('/dashboard/services/' + d.metadata.name); } + $scope.getSelectorUrlFragment = function(sel){ return _.map(sel, function(v, k) { return k + '=' + v }).join(','); }; } ]); diff --git a/www/app/components/dashboard/views/service.html b/www/app/components/dashboard/views/service.html index 63dd7ad5379..4fb03046d59 100644 --- a/www/app/components/dashboard/views/service.html +++ b/www/app/components/dashboard/views/service.html @@ -10,68 +10,81 @@
| Created | - {{service.creationTimestamp | date:'medium'}} + {{service.metadata.creationTimestamp | date:'medium'}} | |
| Port | +Ports |
- {{service.port}}
+
+
+ {{port.name}}:
+
+ {{port.port}}/{{port.protocol}}
+
|
| Container Port | +IP | - {{service.containerPort}} + {{service.spec.portalIP}} |
| Portal IP | +||
| Public IPs | - {{service.portalIP}} - | -|
| Protocol | -- {{service.protocol}} + {{service.spec.publicIPs | join:', '}} | |
| Session Affinity | - {{service.sessionAffinity}} + {{service.spec.sessionAffinity}} | |
| Labels |
-
+
{{label}}: {{value}}
|
|
| Selector | ++ + {{label}}={{value}}{{$last ? '' : ', '}} + + | +|
| Related Pods | - | |
| Related Replication Controllers | - |
| Created | - {{service.creationTimestamp | date:'medium'}} + {{service.metadata.creationTimestamp | date:'medium'}} | |
| Port | +Ports |
- {{service.port}}
+
+
+ {{port.name}}:
+
+ {{port.port}}/{{port.protocol}}
+
|
| Container Port | +IP | - {{service.containerPort}} + {{service.spec.portalIP}} |
| Portal IP | +||
| Public IPs | - {{service.portalIP}} - | -|
| Protocol | -- {{service.protocol}} + {{service.spec.publicIPs | join:', '}} | |
| Session Affinity | - {{service.sessionAffinity}} + {{service.spec.sessionAffinity}} | |
| Labels |
-
+
{{label}}: {{value}}
|
|
| Selector | ++ + {{label}}={{value}}{{$last ? '' : ', '}} + + | +|
| Related Pods | - | |
| Related Replication Controllers | - |