Skip to content

Show service type and load balanced ingress points #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
Jul 23, 2015
Merged

Show service type and load balanced ingress points #24

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions dist/object-describer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,8 @@ angular.module('kubernetesUI').run(['$templateCache', function($templateCache) {
" <dd>{{resource.metadata.namespace}}</dd>\n" +
" <dt>Created</dt>\n" +
" <dd>{{resource.metadata.creationTimestamp | date:'medium'}}</dd>\n" +
" <dt>Type</dt>\n" +
" <dd>{{resource.spec.type}}</dd>\n" +
" <dt>IP</dt>\n" +
" <dd>{{resource.spec.portalIP}}</dd>\n" +
" <dt>Ports</dt>\n" +
Expand All @@ -428,6 +430,11 @@ angular.module('kubernetesUI').run(['$templateCache', function($templateCache) {
" </dd>\n" +
" <dt>Session affinity</dt>\n" +
" <dd>{{resource.spec.sessionAffinity}}</dd> \n" +
" <dt ng-if=\"resource.status.loadBalancer.ingress.length\">Ingress points</dt>\n" +
" <dd ng-if=\"resource.status.loadBalancer.ingress.length\">\n" +
" <span ng-repeat=\"ingress in resource.status.loadBalancer.ingress\"\n" +
" >{{ingress.ip}}<span ng-if=\"!$last\">, </span></span>\n" +
" </dd>\n" +
" </dl>\n" +
" <h3>Selector</h3>\n" +
" <dl class=\"dl-horizontal\">\n" +
Expand Down
110 changes: 103 additions & 7 deletions fixtures/service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,25 @@ window.EXAMPLE_SERVICE = {
"port": 5434,
"targetPort": 3306
},
{
"name": "three",
"protocol": "UDP",
"port": 5436,
"targetPort": 3308
},
{
"name": "two",
"protocol": "TCP",
"port": 5435,
"targetPort": 3307
},
{
"name": "three",
"protocol": "UDP",
"port": 5436,
"targetPort": 3308
}
],
"selector": {
"name": "database"
},
"type": "ClusterIP",
"portalIP": "172.30.17.6",
"sessionAffinity": "None"
"sessionAffinity": "ClientIP"
},
"status": {}
};
Expand All @@ -61,8 +62,103 @@ window.EXAMPLE_HEADLESS_SERVICE = {
"selector": {
"name": "headless"
},
"type": "ClusterIP",
"portalIP": "None",
"sessionAffinity": "None"
},
"status": {}
};

window.EXAMPLE_NODE_PORT_SERVICE = {
"kind": "Service",
"apiVersion": "v1beta3",
"metadata": {
"name": "node-port",
"namespace": "test",
"selfLink": "/api/v1beta3/namespaces/test/services/node-port",
"uid": "4ed21ab1-d3e7-11e4-92f6-54ee75107c99",
"resourceVersion": "104",
"creationTimestamp": "2015-03-26T18:38:34Z",
"labels": {
"template": "my-template"
}
},
"spec": {
"ports": [
{
"name": "",
"protocol": "TCP",
"nodePort": 30060,
"port": 5434,
"targetPort": 3306
},
{
"name": "two",
"protocol": "TCP",
"nodePort": 30061,
"port": 5435,
"targetPort": 3307
}
],
"selector": {
"name": "node-port"
},
"type": "NodePort",
"portalIP": "172.30.17.6",
"sessionAffinity": "None"
},
"status": {}
};

window.EXAMPLE_LOAD_BALANCED_SERVICE = {
"kind": "Service",
"apiVersion": "v1beta3",
"metadata": {
"name": "load-balanced",
"namespace": "test",
"selfLink": "/api/v1beta3/namespaces/test/services/load-balanced",
"uid": "4ed21ab1-d3e7-11e4-92f6-54ee75107c56",
"resourceVersion": "104",
"creationTimestamp": "2015-03-26T18:38:34Z",
"labels": {
"template": "my-template"
}
},
"spec": {
"ports": [
{
"name": "",
"protocol": "TCP",
"nodePort": 30060,
"port": 5434,
"targetPort": 3306
},
{
"name": "two",
"protocol": "TCP",
"nodePort": 30061,
"port": 5435,
"targetPort": 3307
}
],
"selector": {
"name": "load-balanced"
},
"type": "LoadBalancer",
"portalIP": "172.30.17.6",
"sessionAffinity": "None",
"type": "LoadBalancer"
},
"status": {
"loadBalancer": {
"ingress": [
{
"ip": "146.148.47.155"
},
{
"ip": "146.148.47.156"
}
]
}
}
};
8 changes: 8 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ <h1>Service describer</h1>
<h1>Service describer (headless)</h1>
<kubernetes-object-describer resource="kubernetesExampleHeadlessService" more-details-link="example/path/to/more/details.htm" kind="Service"></kubernetes-object-describer>
<hr>
<h1>Service describer (node port)</h1>
<kubernetes-object-describer resource="kubernetesExampleNodePortService" more-details-link="example/path/to/more/details.htm" kind="Service"></kubernetes-object-describer>
<hr>
<h1>Service describer (load balanced)</h1>
<kubernetes-object-describer resource="kubernetesExampleLoadBalancedService" more-details-link="example/path/to/more/details.htm" kind="Service"></kubernetes-object-describer>
<hr>
<h1>Replication Controller describer</h1>
<kubernetes-object-describer resource="kubernetesExampleRC" more-details-link="example/path/to/more/details.htm" kind="ReplicationController"></kubernetes-object-describer>
<!-- build:js(.) scripts/vendor.js -->
Expand All @@ -57,6 +63,8 @@ <h1>Replication Controller describer</h1>
$rootScope.kubernetesExamplePod = window.EXAMPLE_POD;
$rootScope.kubernetesExampleService = window.EXAMPLE_SERVICE;
$rootScope.kubernetesExampleHeadlessService = window.EXAMPLE_HEADLESS_SERVICE;
$rootScope.kubernetesExampleNodePortService = window.EXAMPLE_NODE_PORT_SERVICE;
$rootScope.kubernetesExampleLoadBalancedService = window.EXAMPLE_LOAD_BALANCED_SERVICE;
$rootScope.kubernetesExampleRC = window.EXAMPLE_RC;
});
</script>
Expand Down
7 changes: 7 additions & 0 deletions views/service.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<dd>{{resource.metadata.namespace}}</dd>
<dt>Created</dt>
<dd>{{resource.metadata.creationTimestamp | date:'medium'}}</dd>
<dt>Type</dt>
<dd>{{resource.spec.type}}</dd>
<dt>IP</dt>
<dd>{{resource.spec.portalIP}}</dd>
<dt>Ports</dt>
Expand All @@ -18,6 +20,11 @@
</dd>
<dt>Session affinity</dt>
<dd>{{resource.spec.sessionAffinity}}</dd>
<dt ng-if="resource.status.loadBalancer.ingress.length">Ingress points</dt>
<dd ng-if="resource.status.loadBalancer.ingress.length">
<span ng-repeat="ingress in resource.status.loadBalancer.ingress"
>{{ingress.ip}}<span ng-if="!$last">, </span></span>
</dd>
</dl>
<h3>Selector</h3>
<dl class="dl-horizontal">
Expand Down