Skip to content

Commit 68f0d3d

Browse files
spadgettspadgett
committed
Update to API version v1
1 parent 3759f4e commit 68f0d3d

File tree

10 files changed

+49
-43
lines changed

10 files changed

+49
-43
lines changed

‎dist/object-describer.js‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ angular.module('kubernetesUI').run(['$templateCache', function($templateCache) {
224224
" Running\n" +
225225
" <span ng-if=\"stateDescription.startedAt\">since {{stateDescription.startedAt | date:'medium'}}</span>\n" +
226226
" </span>\n" +
227-
" <span ng-switch-when=\"termination\">\n" +
227+
" <span ng-switch-when=\"terminated\">\n" +
228228
" Terminated\n" +
229229
" <span ng-if=\"stateDescription.finishedAt\">at {{stateDescription.finishedAt | date:'medium'}}</span>\n" +
230230
" <span ng-if=\"stateDescription.exitCode\">with exit code {{stateDescription.exitCode}}</span>\n" +
@@ -263,7 +263,8 @@ angular.module('kubernetesUI').run(['$templateCache', function($templateCache) {
263263
"<dt>Name</dt>\n" +
264264
"<dd>{{container.name}}</dd>\n" +
265265
"<dt>Image</dt>\n" +
266-
"<dd>{{container.image}}</dd>\n" +
266+
"<dd ng-if=\"container.image\">{{container.image}}</dd>\n" +
267+
"<dd ng-if=\"!container.image\"><em>none</em></dd>\n" +
267268
"<dt>Ports</dt>\n" +
268269
"<dd>\n" +
269270
" <div ng-if=\"!container.ports.length\"><em>none</em></div>\n" +
@@ -333,11 +334,13 @@ angular.module('kubernetesUI').run(['$templateCache', function($templateCache) {
333334
" <dd>{{template.restartPolicy}}</dd>\n" +
334335
" <dt>DNS policy</dt>\n" +
335336
" <dd>{{template.dnsPolicy}}</dd>\n" +
337+
" <dt ng-if=\"template.serviceAccountName\">Service account</dt>\n" +
338+
" <dd ng-if=\"template.serviceAccountName\">{{template.serviceAccountName}}</dd>\n" +
336339
"</dl> \n" +
337340
"<h4>Containers</h4>\n" +
338341
"<kubernetes-object-describe-containers containers=\"template.containers\"></kubernetes-object-describe-containers>\n" +
339342
"<h4>Volumes</h4>\n" +
340-
"<kubernetes-object-describe-volumes volumes=\"template.volumes\"></kubernetes-object-describe-volumes> "
343+
"<kubernetes-object-describe-volumes volumes=\"template.volumes\"></kubernetes-object-describe-volumes> \n"
341344
);
342345

343346

@@ -353,14 +356,16 @@ angular.module('kubernetesUI').run(['$templateCache', function($templateCache) {
353356
" <dd>{{resource.metadata.creationTimestamp | date:'medium'}}</dd>\n" +
354357
" <dt>Restart policy</dt>\n" +
355358
" <dd>{{resource.spec.restartPolicy || 'Always'}}</dd>\n" +
359+
" <dt ng-if=\"resource.spec.serviceAccountName\">Service account</dt>\n" +
360+
" <dd ng-if=\"resource.spec.serviceAccountName\">{{resource.spec.serviceAccountName}}</dd>\n" +
356361
" </dl>\n" +
357362
" <h3>Status</h3>\n" +
358363
" <dl class=\"dl-horizontal\">\n" +
359364
" <dt>Phase</dt>\n" +
360365
" <dd>{{resource.status.phase}}</dd>\n" +
361366
" <dt>Node</dt>\n" +
362-
" <dd>{{resource.spec.host || 'unknown'}}\n" +
363-
" <span ng-if=\"resource.status.hostIP && resource.spec.host != resource.status.hostIP\">({{resource.status.hostIP}})</dd>\n" +
367+
" <dd>{{resource.spec.nodeName || 'unknown'}}\n" +
368+
" <span ng-if=\"resource.status.hostIP && resource.spec.nodeName != resource.status.hostIP\">({{resource.status.hostIP}})</span></dd>\n" +
364369
" <dt>IP on node</dt>\n" +
365370
" <dd>\n" +
366371
" {{resource.status.podIP}}\n" +
@@ -391,8 +396,7 @@ angular.module('kubernetesUI').run(['$templateCache', function($templateCache) {
391396
" <dt>Created</dt>\n" +
392397
" <dd>{{resource.metadata.creationTimestamp | date:'medium'}}</dd>\n" +
393398
" <dt>Replicas</dt>\n" +
394-
" <!-- TODO: Update for API version v1. The default has changed from 0 to 1. -->\n" +
395-
" <dd>{{resource.spec.replicas || 0}}</dd>\n" +
399+
" <dd>{{(resource.spec.replicas === undefined) ? 1 : resource.spec.replicas}}</dd>\n" +
396400
" </dl>\n" +
397401
" <h3>Selector</h3>\n" +
398402
" <dl class=\"dl-horizontal\">\n" +
@@ -420,7 +424,7 @@ angular.module('kubernetesUI').run(['$templateCache', function($templateCache) {
420424
" <dt>Type</dt>\n" +
421425
" <dd>{{resource.spec.type}}</dd>\n" +
422426
" <dt>IP</dt>\n" +
423-
" <dd>{{resource.spec.portalIP}}</dd>\n" +
427+
" <dd>{{resource.spec.clusterIP}}</dd>\n" +
424428
" <dt>Ports</dt>\n" +
425429
" <dd>\n" +
426430
" <div ng-if=\"!resource.spec.ports.length\">None</div>\n" +

‎fixtures/pod.js‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
window.EXAMPLE_POD = {
22
"kind": "Pod",
3-
"apiVersion": "v1beta3",
3+
"apiVersion": "v1",
44
"metadata": {
55
"name": "example-pod",
66
"namespace": "test",
7-
"selfLink": "/api/v1beta3/namespaces/test/pods/example-pod",
7+
"selfLink": "/api/v1/namespaces/test/pods/example-pod",
88
"uid": "6aefeebf-d7d2-11e4-a675-54ee75107c12",
99
"resourceVersion": "20060",
1010
"creationTimestamp": "2015-03-31T18:19:06Z",
@@ -38,8 +38,7 @@ window.EXAMPLE_POD = {
3838
],
3939
"resources": {},
4040
"terminationMessagePath": "/dev/termination-log",
41-
"imagePullPolicy": "IfNotPresent",
42-
"capabilities": {}
41+
"imagePullPolicy": "IfNotPresent"
4342
},
4443
{
4544
"name": "container-2",
@@ -52,8 +51,7 @@ window.EXAMPLE_POD = {
5251
],
5352
"resources": {},
5453
"terminationMessagePath": "/dev/termination-log",
55-
"imagePullPolicy": "IfNotPresent",
56-
"capabilities": {}
54+
"imagePullPolicy": "IfNotPresent"
5755
},
5856
{
5957
"name": "container-3",
@@ -66,13 +64,13 @@ window.EXAMPLE_POD = {
6664
],
6765
"resources": {},
6866
"terminationMessagePath": "/dev/termination-log",
69-
"imagePullPolicy": "IfNotPresent",
70-
"capabilities": {}
67+
"imagePullPolicy": "IfNotPresent"
7168
}
7269
],
7370
"restartPolicy": "Always",
7471
"dnsPolicy": "ClusterFirst",
75-
"host": "example.node.com"
72+
"nodeName": "example.node.com",
73+
"serviceAccountName": "default"
7674
},
7775
"status": {
7876
"phase": "Running",
@@ -116,7 +114,7 @@ window.EXAMPLE_POD = {
116114
{
117115
"name": "container-3",
118116
"state": {
119-
"termination": {
117+
"terminated": {
120118
"finishedAt": "2015-05-11T20:32:19Z",
121119
"exitCode": 1,
122120
"reason": "An error occurred"

‎fixtures/replicationController.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
window.EXAMPLE_RC = {
22
"kind": "ReplicationController",
3-
"apiVersion": "v1beta3",
3+
"apiVersion": "v1",
44
"metadata": {
55
"name": "database-1",
66
"namespace": "test",
7-
"selfLink": "/api/v1beta3/namespaces/test/replicationcontrollers/database-1",
7+
"selfLink": "/api/v1/namespaces/test/replicationcontrollers/database-1",
88
"uid": "4ee3fd17-d3e7-11e4-92f6-54ee75107c12",
99
"resourceVersion": "22681",
1010
"creationTimestamp": "2015-03-26T18:38:34Z",
@@ -72,12 +72,12 @@ window.EXAMPLE_RC = {
7272
],
7373
"resources": {},
7474
"terminationMessagePath": "/dev/termination-log",
75-
"imagePullPolicy": "IfNotPresent",
76-
"capabilities": {}
75+
"imagePullPolicy": "IfNotPresent"
7776
}
7877
],
7978
"restartPolicy": "Always",
80-
"dnsPolicy": "ClusterFirst"
79+
"dnsPolicy": "ClusterFirst",
80+
"serviceAccountName": "default"
8181
}
8282
}
8383
},

‎fixtures/service.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
window.EXAMPLE_SERVICE = {
22
"kind": "Service",
3-
"apiVersion": "v1beta3",
3+
"apiVersion": "v1",
44
"metadata": {
55
"name": "database",
66
"namespace": "test",
7-
"selfLink": "/api/v1beta3/namespaces/test/services/database",
7+
"selfLink": "/api/v1/namespaces/test/services/database",
88
"uid": "4ed21ab1-d3e7-11e4-92f6-54ee75107c12",
99
"resourceVersion": "102",
1010
"creationTimestamp": "2015-03-26T18:38:34Z",
@@ -37,19 +37,19 @@ window.EXAMPLE_SERVICE = {
3737
"name": "database"
3838
},
3939
"type": "ClusterIP",
40-
"portalIP": "172.30.17.6",
40+
"clusterIP": "172.30.17.6",
4141
"sessionAffinity": "ClientIP"
4242
},
4343
"status": {}
4444
};
4545

4646
window.EXAMPLE_HEADLESS_SERVICE = {
4747
"kind": "Service",
48-
"apiVersion": "v1beta3",
48+
"apiVersion": "v1",
4949
"metadata": {
5050
"name": "headless",
5151
"namespace": "test",
52-
"selfLink": "/api/v1beta3/namespaces/test/services/headless",
52+
"selfLink": "/api/v1/namespaces/test/services/headless",
5353
"uid": "16e6dee1-e922-11e4-894c-0296ae7c2489",
5454
"resourceVersion": "102",
5555
"creationTimestamp": "2015-04-22T19:02:15Z",
@@ -63,19 +63,19 @@ window.EXAMPLE_HEADLESS_SERVICE = {
6363
"name": "headless"
6464
},
6565
"type": "ClusterIP",
66-
"portalIP": "None",
66+
"clusterIP": "None",
6767
"sessionAffinity": "None"
6868
},
6969
"status": {}
7070
};
7171

7272
window.EXAMPLE_NODE_PORT_SERVICE = {
7373
"kind": "Service",
74-
"apiVersion": "v1beta3",
74+
"apiVersion": "v1",
7575
"metadata": {
7676
"name": "node-port",
7777
"namespace": "test",
78-
"selfLink": "/api/v1beta3/namespaces/test/services/node-port",
78+
"selfLink": "/api/v1/namespaces/test/services/node-port",
7979
"uid": "4ed21ab1-d3e7-11e4-92f6-54ee75107c99",
8080
"resourceVersion": "104",
8181
"creationTimestamp": "2015-03-26T18:38:34Z",
@@ -104,19 +104,19 @@ window.EXAMPLE_NODE_PORT_SERVICE = {
104104
"name": "node-port"
105105
},
106106
"type": "NodePort",
107-
"portalIP": "172.30.17.6",
107+
"clusterIP": "172.30.17.6",
108108
"sessionAffinity": "None"
109109
},
110110
"status": {}
111111
};
112112

113113
window.EXAMPLE_LOAD_BALANCED_SERVICE = {
114114
"kind": "Service",
115-
"apiVersion": "v1beta3",
115+
"apiVersion": "v1",
116116
"metadata": {
117117
"name": "load-balanced",
118118
"namespace": "test",
119-
"selfLink": "/api/v1beta3/namespaces/test/services/load-balanced",
119+
"selfLink": "/api/v1/namespaces/test/services/load-balanced",
120120
"uid": "4ed21ab1-d3e7-11e4-92f6-54ee75107c56",
121121
"resourceVersion": "104",
122122
"creationTimestamp": "2015-03-26T18:38:34Z",
@@ -145,7 +145,7 @@ window.EXAMPLE_LOAD_BALANCED_SERVICE = {
145145
"name": "load-balanced"
146146
},
147147
"type": "LoadBalancer",
148-
"portalIP": "172.30.17.6",
148+
"clusterIP": "172.30.17.6",
149149
"sessionAffinity": "None",
150150
"type": "LoadBalancer"
151151
},

‎views/container-state.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Running
1010
<span ng-if="stateDescription.startedAt">since {{stateDescription.startedAt | date:'medium'}}</span>
1111
</span>
12-
<span ng-switch-when="termination">
12+
<span ng-switch-when="terminated">
1313
Terminated
1414
<span ng-if="stateDescription.finishedAt">at {{stateDescription.finishedAt | date:'medium'}}</span>
1515
<span ng-if="stateDescription.exitCode">with exit code {{stateDescription.exitCode}}</span>

‎views/containers.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
<dt>Name</dt>
44
<dd>{{container.name}}</dd>
55
<dt>Image</dt>
6-
<dd>{{container.image}}</dd>
6+
<dd ng-if="container.image">{{container.image}}</dd>
7+
<dd ng-if="!container.image"><em>none</em></dd>
78
<dt>Ports</dt>
89
<dd>
910
<div ng-if="!container.ports.length"><em>none</em></div>

‎views/pod-template.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ <h3>Pod Template</h3>
44
<dd>{{template.restartPolicy}}</dd>
55
<dt>DNS policy</dt>
66
<dd>{{template.dnsPolicy}}</dd>
7+
<dt ng-if="template.serviceAccountName">Service account</dt>
8+
<dd ng-if="template.serviceAccountName">{{template.serviceAccountName}}</dd>
79
</dl>
810
<h4>Containers</h4>
911
<kubernetes-object-describe-containers containers="template.containers"></kubernetes-object-describe-containers>
1012
<h4>Volumes</h4>
11-
<kubernetes-object-describe-volumes volumes="template.volumes"></kubernetes-object-describe-volumes>
13+
<kubernetes-object-describe-volumes volumes="template.volumes"></kubernetes-object-describe-volumes>

‎views/pod.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,16 @@
99
<dd>{{resource.metadata.creationTimestamp | date:'medium'}}</dd>
1010
<dt>Restart policy</dt>
1111
<dd>{{resource.spec.restartPolicy || 'Always'}}</dd>
12+
<dt ng-if="resource.spec.serviceAccountName">Service account</dt>
13+
<dd ng-if="resource.spec.serviceAccountName">{{resource.spec.serviceAccountName}}</dd>
1214
</dl>
1315
<h3>Status</h3>
1416
<dl class="dl-horizontal">
1517
<dt>Phase</dt>
1618
<dd>{{resource.status.phase}}</dd>
1719
<dt>Node</dt>
18-
<dd>{{resource.spec.host || 'unknown'}}
19-
<span ng-if="resource.status.hostIP && resource.spec.host != resource.status.hostIP">({{resource.status.hostIP}})</dd>
20+
<dd>{{resource.spec.nodeName || 'unknown'}}
21+
<span ng-if="resource.status.hostIP && resource.spec.nodeName != resource.status.hostIP">({{resource.status.hostIP}})</span></dd>
2022
<dt>IP on node</dt>
2123
<dd>
2224
{{resource.status.podIP}}

‎views/replication-controller.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
<dt>Created</dt>
99
<dd>{{resource.metadata.creationTimestamp | date:'medium'}}</dd>
1010
<dt>Replicas</dt>
11-
<!-- TODO: Update for API version v1. The default has changed from 0 to 1. -->
12-
<dd>{{resource.spec.replicas || 0}}</dd>
11+
<dd>{{(resource.spec.replicas === undefined) ? 1 : resource.spec.replicas}}</dd>
1312
</dl>
1413
<h3>Selector</h3>
1514
<dl class="dl-horizontal">

‎views/service.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<dt>Type</dt>
1111
<dd>{{resource.spec.type}}</dd>
1212
<dt>IP</dt>
13-
<dd>{{resource.spec.portalIP}}</dd>
13+
<dd>{{resource.spec.clusterIP}}</dd>
1414
<dt>Ports</dt>
1515
<dd>
1616
<div ng-if="!resource.spec.ports.length">None</div>

0 commit comments

Comments
 (0)