diff --git a/dist/object-describer.js b/dist/object-describer.js index f01bbb2..28d2eee 100644 --- a/dist/object-describer.js +++ b/dist/object-describer.js @@ -417,6 +417,8 @@ angular.module('kubernetesUI').run(['$templateCache', function($templateCache) { "
{{resource.metadata.namespace}}
\n" + "
Created
\n" + "
{{resource.metadata.creationTimestamp | date:'medium'}}
\n" + + "
Type
\n" + + "
{{resource.spec.type}}
\n" + "
IP
\n" + "
{{resource.spec.portalIP}}
\n" + "
Ports
\n" + @@ -428,6 +430,11 @@ angular.module('kubernetesUI').run(['$templateCache', function($templateCache) { " \n" + "
Session affinity
\n" + "
{{resource.spec.sessionAffinity}}
\n" + + "
Ingress points
\n" + + "
\n" + + " {{ingress.ip}}, \n" + + "
\n" + " \n" + "

Selector

\n" + "
\n" + diff --git a/fixtures/service.js b/fixtures/service.js index b577b36..a73b069 100644 --- a/fixtures/service.js +++ b/fixtures/service.js @@ -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": {} }; @@ -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" + } + ] + } + } +}; diff --git a/index.html b/index.html index 4b2c725..ac1d028 100644 --- a/index.html +++ b/index.html @@ -34,6 +34,12 @@

Service describer

Service describer (headless)


+

Service describer (node port)

+ +
+

Service describer (load balanced)

+ +

Replication Controller describer

@@ -57,6 +63,8 @@

Replication Controller describer

$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; }); diff --git a/views/service.html b/views/service.html index 97d26e2..74fa74f 100644 --- a/views/service.html +++ b/views/service.html @@ -7,6 +7,8 @@
{{resource.metadata.namespace}}
Created
{{resource.metadata.creationTimestamp | date:'medium'}}
+
Type
+
{{resource.spec.type}}
IP
{{resource.spec.portalIP}}
Ports
@@ -18,6 +20,11 @@
Session affinity
{{resource.spec.sessionAffinity}}
+
Ingress points
+
+ {{ingress.ip}}, +

Selector