Skip to content

Commit

Permalink
Update services for v1beta3 api
Browse files Browse the repository at this point in the history
  • Loading branch information
@bcbroussard
bcbroussard committed May 28, 2015
1 parent eab1cec commit 1fd4050
Show file tree
Hide file tree
Showing 6 changed files with 235 additions and 193 deletions.
190 changes: 102 additions & 88 deletions pkg/ui/datafile.go
View file

Large diffs are not rendered by default.

57 changes: 27 additions & 30 deletions www/app/assets/js/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1700,7 +1700,7 @@ app.controller('ListServicesCtrl', [
'$scope',
'$interval',
'$routeParams',
'k8sApi',
'k8sv1Beta3Api',
'$rootScope',
'$location',
function($scope, $interval, $routeParams, k8sApi, $rootScope, $location) {
Expand All @@ -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 = {
Expand Down Expand Up @@ -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
});
});
}
Expand Down Expand Up @@ -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();
Expand All @@ -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(','); };

}
]);
Expand Down
61 changes: 39 additions & 22 deletions www/app/components/dashboard/views/service.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,77 +10,94 @@

<div class="heading">
<span class="label">Service: </span>
<span>{{service.id}}</span>
<span>{{service.metadata.name}}</span>
</div>


<table>
<table class="align-top">
<tbody>
<tr>
<td class="name">Created</td>
<td class="value">
{{service.creationTimestamp | date:'medium'}}
{{service.metadata.creationTimestamp | date:'medium'}}
</td>
</tr>

<tr>
<td class="name">Port</td>
<td class="name">Ports</td>
<td class="value">
{{service.port}}
<div ng-repeat="port in service.spec.ports">
<span ng-show="port.name">
{{port.name}}:
</span>
{{port.port}}/{{port.protocol}}
</div>
</td>
</tr>

<tr>
<td class="name">Container Port</td>
<td class="value">
{{service.containerPort}}
</td>
</tr>

<tr>
<td class="name">Portal IP</td>
<td class="name">IP</td>
<td class="value">
{{service.portalIP}}
{{service.spec.portalIP}}
</td>
</tr>

<tr>
<td class="name">Protocol</td>
<tr ng-show="service.spec.publicIPs">
<td class="name">Public IPs</td>
<td class="value">
{{service.protocol}}
{{service.spec.publicIPs | join:', '}}
</td>
</tr>

<tr>
<td class="name">Session Affinity</td>
<td class="value">
{{service.sessionAffinity}}
{{service.spec.sessionAffinity}}
</td>
</tr>

<tr>
<td class="name">Labels</td>
<td class="value">
<div ng-repeat="(label, value) in service.labels">
<div ng-repeat="(label, value) in service.metadata.labels">
{{label}}: {{value}}
</div>
</td>
</tr>

<tr ng-show="service.spec.selector">
<td class="name">Selector</td>
<td class="value">
<span ng-repeat="(label, value) in service.spec.selector">
{{label}}={{value}}{{$last ? '' : ', '}}
</span>
</td>
</tr>


<tr>
<td class="name">Related Pods</td>
<td class="value">
<div ng-repeat="(label, value) in service.selector">
<a ng-href="#/dashboard/groups/type/selector/{{label}}={{value}},type=pod">{{label}}: {{value}}</a>
<div ng-show="service.spec.selector && Object.keys(service.spec.selector).length > 1">
<a ng-href="#/dashboard/groups/type/selector/{{getSelectorUrlFragment(service.spec.selector)}},type=pod">{{getSelectorUrlFragment(service.spec.selector)}}</a>
</div>

<div ng-repeat="(label, value) in service.spec.selector">
<a ng-href="#/dashboard/groups/type/selector/{{label}}={{value}},type=pod">{{label}}={{value}}</a>
</div>
</td>
</tr>

<tr>
<td class="name">Related Replication Controllers</td>
<td class="value">
<div ng-repeat="(label, value) in service.selector">
<a ng-href="#/dashboard/groups/type/selector/{{label}}={{value}},type=replicationController">{{label}}: {{value}}</a>
<div ng-show="service.spec.selector && Object.keys(service.spec.selector).length > 1">
<a ng-href="#/dashboard/groups/type/selector/{{getSelectorUrlFragment(service.spec.selector)}},type=replicationController">{{getSelectorUrlFragment(service.spec.selector)}}</a>
</div>

<div ng-repeat="(label, value) in service.spec.selector">
<a ng-href="#/dashboard/groups/type/selector/{{label}}={{value}},type=replicationController">{{label}}={{value}}</a>
</div>
</td>
</tr>
Expand Down
55 changes: 25 additions & 30 deletions www/master/components/dashboard/js/modules/controllers/listServicesController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ app.controller('ListServicesCtrl', [
'$scope',
'$interval',
'$routeParams',
'k8sApi',
'k8sv1Beta3Api',
'$rootScope',
'$location',
function($scope, $interval, $routeParams, k8sApi, $rootScope, $location) {
Expand All @@ -19,7 +19,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 = {
Expand Down Expand Up @@ -67,41 +67,36 @@ app.controller('ListServicesCtrl', [
if (data.items.constructor === Array) {
data.items.forEach(function(service) {

var _name = '', _uses = '', _component = '', _provider = '';

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];
}
});
var _labels = '';

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
});
});
}
Expand Down
4 changes: 3 additions & 1 deletion www/master/components/dashboard/js/modules/controllers/serviceController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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();
Expand All @@ -31,6 +31,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(','); };

}
]);
Loading

0 comments on commit 1fd4050

Please sign in to comment.