Skip to content

Commit 09ba995

Browse files
jwforresjwforres
committed
Merge pull request #24 from spadgett/service-type-fixtures
Show service type and load balanced ingress points
2 parents b9a72ed + d4dc79c commit 09ba995

File tree

4 files changed

+125
-7
lines changed

4 files changed

+125
-7
lines changed

‎dist/object-describer.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,8 @@ angular.module('kubernetesUI').run(['$templateCache', function($templateCache) {
417417
" <dd>{{resource.metadata.namespace}}</dd>\n" +
418418
" <dt>Created</dt>\n" +
419419
" <dd>{{resource.metadata.creationTimestamp | date:'medium'}}</dd>\n" +
420+
" <dt>Type</dt>\n" +
421+
" <dd>{{resource.spec.type}}</dd>\n" +
420422
" <dt>IP</dt>\n" +
421423
" <dd>{{resource.spec.portalIP}}</dd>\n" +
422424
" <dt>Ports</dt>\n" +
@@ -428,6 +430,11 @@ angular.module('kubernetesUI').run(['$templateCache', function($templateCache) {
428430
" </dd>\n" +
429431
" <dt>Session affinity</dt>\n" +
430432
" <dd>{{resource.spec.sessionAffinity}}</dd> \n" +
433+
" <dt ng-if=\"resource.status.loadBalancer.ingress.length\">Ingress points</dt>\n" +
434+
" <dd ng-if=\"resource.status.loadBalancer.ingress.length\">\n" +
435+
" <span ng-repeat=\"ingress in resource.status.loadBalancer.ingress\"\n" +
436+
" >{{ingress.ip}}<span ng-if=\"!$last\">, </span></span>\n" +
437+
" </dd>\n" +
431438
" </dl>\n" +
432439
" <h3>Selector</h3>\n" +
433440
" <dl class=\"dl-horizontal\">\n" +

‎fixtures/service.js‎

Lines changed: 103 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,25 @@ window.EXAMPLE_SERVICE = {
2020
"port": 5434,
2121
"targetPort": 3306
2222
},
23-
{
24-
"name": "three",
25-
"protocol": "UDP",
26-
"port": 5436,
27-
"targetPort": 3308
28-
},
2923
{
3024
"name": "two",
3125
"protocol": "TCP",
3226
"port": 5435,
3327
"targetPort": 3307
28+
},
29+
{
30+
"name": "three",
31+
"protocol": "UDP",
32+
"port": 5436,
33+
"targetPort": 3308
3434
}
3535
],
3636
"selector": {
3737
"name": "database"
3838
},
39+
"type": "ClusterIP",
3940
"portalIP": "172.30.17.6",
40-
"sessionAffinity": "None"
41+
"sessionAffinity": "ClientIP"
4142
},
4243
"status": {}
4344
};
@@ -61,8 +62,103 @@ window.EXAMPLE_HEADLESS_SERVICE = {
6162
"selector": {
6263
"name": "headless"
6364
},
65+
"type": "ClusterIP",
6466
"portalIP": "None",
6567
"sessionAffinity": "None"
6668
},
6769
"status": {}
6870
};
71+
72+
window.EXAMPLE_NODE_PORT_SERVICE = {
73+
"kind": "Service",
74+
"apiVersion": "v1beta3",
75+
"metadata": {
76+
"name": "node-port",
77+
"namespace": "test",
78+
"selfLink": "/api/v1beta3/namespaces/test/services/node-port",
79+
"uid": "4ed21ab1-d3e7-11e4-92f6-54ee75107c99",
80+
"resourceVersion": "104",
81+
"creationTimestamp": "2015-03-26T18:38:34Z",
82+
"labels": {
83+
"template": "my-template"
84+
}
85+
},
86+
"spec": {
87+
"ports": [
88+
{
89+
"name": "",
90+
"protocol": "TCP",
91+
"nodePort": 30060,
92+
"port": 5434,
93+
"targetPort": 3306
94+
},
95+
{
96+
"name": "two",
97+
"protocol": "TCP",
98+
"nodePort": 30061,
99+
"port": 5435,
100+
"targetPort": 3307
101+
}
102+
],
103+
"selector": {
104+
"name": "node-port"
105+
},
106+
"type": "NodePort",
107+
"portalIP": "172.30.17.6",
108+
"sessionAffinity": "None"
109+
},
110+
"status": {}
111+
};
112+
113+
window.EXAMPLE_LOAD_BALANCED_SERVICE = {
114+
"kind": "Service",
115+
"apiVersion": "v1beta3",
116+
"metadata": {
117+
"name": "load-balanced",
118+
"namespace": "test",
119+
"selfLink": "/api/v1beta3/namespaces/test/services/load-balanced",
120+
"uid": "4ed21ab1-d3e7-11e4-92f6-54ee75107c56",
121+
"resourceVersion": "104",
122+
"creationTimestamp": "2015-03-26T18:38:34Z",
123+
"labels": {
124+
"template": "my-template"
125+
}
126+
},
127+
"spec": {
128+
"ports": [
129+
{
130+
"name": "",
131+
"protocol": "TCP",
132+
"nodePort": 30060,
133+
"port": 5434,
134+
"targetPort": 3306
135+
},
136+
{
137+
"name": "two",
138+
"protocol": "TCP",
139+
"nodePort": 30061,
140+
"port": 5435,
141+
"targetPort": 3307
142+
}
143+
],
144+
"selector": {
145+
"name": "load-balanced"
146+
},
147+
"type": "LoadBalancer",
148+
"portalIP": "172.30.17.6",
149+
"sessionAffinity": "None",
150+
"type": "LoadBalancer"
151+
},
152+
"status": {
153+
"loadBalancer": {
154+
"ingress": [
155+
{
156+
"ip": "146.148.47.155"
157+
},
158+
{
159+
"ip": "146.148.47.156"
160+
}
161+
]
162+
}
163+
}
164+
};

‎index.html‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ <h1>Service describer</h1>
3434
<h1>Service describer (headless)</h1>
3535
<kubernetes-object-describer resource="kubernetesExampleHeadlessService" more-details-link="example/path/to/more/details.htm" kind="Service"></kubernetes-object-describer>
3636
<hr>
37+
<h1>Service describer (node port)</h1>
38+
<kubernetes-object-describer resource="kubernetesExampleNodePortService" more-details-link="example/path/to/more/details.htm" kind="Service"></kubernetes-object-describer>
39+
<hr>
40+
<h1>Service describer (load balanced)</h1>
41+
<kubernetes-object-describer resource="kubernetesExampleLoadBalancedService" more-details-link="example/path/to/more/details.htm" kind="Service"></kubernetes-object-describer>
42+
<hr>
3743
<h1>Replication Controller describer</h1>
3844
<kubernetes-object-describer resource="kubernetesExampleRC" more-details-link="example/path/to/more/details.htm" kind="ReplicationController"></kubernetes-object-describer>
3945
<!-- build:js(.) scripts/vendor.js -->
@@ -57,6 +63,8 @@ <h1>Replication Controller describer</h1>
5763
$rootScope.kubernetesExamplePod = window.EXAMPLE_POD;
5864
$rootScope.kubernetesExampleService = window.EXAMPLE_SERVICE;
5965
$rootScope.kubernetesExampleHeadlessService = window.EXAMPLE_HEADLESS_SERVICE;
66+
$rootScope.kubernetesExampleNodePortService = window.EXAMPLE_NODE_PORT_SERVICE;
67+
$rootScope.kubernetesExampleLoadBalancedService = window.EXAMPLE_LOAD_BALANCED_SERVICE;
6068
$rootScope.kubernetesExampleRC = window.EXAMPLE_RC;
6169
});
6270
</script>

‎views/service.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
<dd>{{resource.metadata.namespace}}</dd>
88
<dt>Created</dt>
99
<dd>{{resource.metadata.creationTimestamp | date:'medium'}}</dd>
10+
<dt>Type</dt>
11+
<dd>{{resource.spec.type}}</dd>
1012
<dt>IP</dt>
1113
<dd>{{resource.spec.portalIP}}</dd>
1214
<dt>Ports</dt>
@@ -18,6 +20,11 @@
1820
</dd>
1921
<dt>Session affinity</dt>
2022
<dd>{{resource.spec.sessionAffinity}}</dd>
23+
<dt ng-if="resource.status.loadBalancer.ingress.length">Ingress points</dt>
24+
<dd ng-if="resource.status.loadBalancer.ingress.length">
25+
<span ng-repeat="ingress in resource.status.loadBalancer.ingress"
26+
>{{ingress.ip}}<span ng-if="!$last">, </span></span>
27+
</dd>
2128
</dl>
2229
<h3>Selector</h3>
2330
<dl class="dl-horizontal">

0 commit comments

Comments
 (0)