Skip to content

Output more details on pod details page in web console #1153

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
openshift-bot merged 1 commit into from
Feb 26, 2015
Merged

Output more details on pod details page in web console #1153

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
2 changes: 1 addition & 1 deletion assets/app/views/_pod-template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ <h4>{{container.name}}</h4>
<span data-icon="" aria-hidden="true" class="font-icon"></span>
</div>Ports:
<div ng-repeat="port in container.ports" style="position: relative;">
<span>{{port.containerPort}} ({{port.protocol}})</span>
<span>{{port.containerPort}} ({{port.protocol}})<span ng-if="port.hostPort"> <span style="color: #ddd;">&#10230;</span> {{port.hostPort}}</span></span>
<span class="connector connector-horizontal" style="left: -21px; top: 50%; width: 21px;">
<span class="connector-endpoint" style="left: -3px;"></span>
<span class="connector-line" style="top: 0px; left: 3px;width: 17px;"></span>
Expand Down
54 changes: 51 additions & 3 deletions assets/app/views/pods.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,58 @@ <h1>Pods</h1>
<em>{{emptyMessage}}</em>
</div>
</div>
<div style="margin-bottom: 10px;" ng-repeat="pod in pods">
<h3>{{pod.metadata.name}} ({{pod.status.phase}})</h3>
<div style="margin-bottom: 10px;" ng-repeat="pod in pods | orderObjectsByDate : true" class="tile">
<h2>{{pod.metadata.name}}</h2>
<div>
<span style="margin-right: 5px;">Status: {{pod.status.phase}}</span>
<span ng-switch="pod.status.phase">
<span ng-switch-when="Succeeded" class="fa fa-check text-success" aria-hidden="true" style="margin-right: 5px;"></span>
<span ng-switch-when="Terminated" class="fa fa-times text-danger" aria-hidden="true" style="margin-right: 5px;"></span>
<span ng-switch-when="Pending" class="fa fa-refresh fa-spin" aria-hidden="true" style="margin-right: 5px;"></span>
<span ng-switch-when="Running" class="fa fa-refresh text-success" aria-hidden="true" style="margin-right: 5px;"></span>
</span>
</div>
<div>
Node: {{pod.status.host || 'unknown'}} <span ng-if="pod.status.hostIP && pod.status.host != pod.status.hostIP">({{pod.status.hostIP}})</span>
</div>
<div>
IP on node: {{pod.status.podIP || 'unknown'}}
</div>
<div>
Restart policy:
<span ng-if="pod.spec.restartPolicy.always">
always <span ng-if="pod.status.info.POD">(restarted {{pod.status.info.POD.restartCount}} times)</span>
</span>
<span ng-if="pod.spec.restartPolicy.onFailure">
on failure <span ng-if="pod.status.info.POD">(restarted {{pod.status.info.POD.restartCount}} times)</span>
</span>
<span ng-if="pod.spec.restartPolicy.never">
never <span ng-if="pod.status.info.POD.restartCount">(previously restarted {{pod.status.info.POD.restartCount}} times)</span>
</span>
</div>
<div ng-if="pod.spec.volumes.length">
Volumes:
<ul>
<li ng-repeat="volume in pod.spec.volumes">
<div>{{volume.name}}</div>
<div ng-if="volume.source.hostPath">
<div>Type: host path</div>
<div>Path: {{volume.source.hostPath.path}}</div>
</div>
<div ng-if="volume.source.emptyDir">Type: empty directory</div>
<!-- TODO fill out GCE persistent disk details -->
<div ng-if="volume.source.gcePersistentDisk">Type: GCE persistent disk</div>
<div ng-if="volume.source.gitRepo">
<div>Type: Git repository</div>
<div>Repository: {{volume.source.gitRepo.repository}}</div>
<div ng-if="volume.source.gitRepo.revision">Revision: {{volume.source.gitRepo.revision}}</div>
</div>
</li>
</ul>
</div>
<div>Pod template:</div>
<pod-template ng-init="podTemplate = pod"></pod-template>
</div>
</div>
</div>
</project-page>
</div>
54 changes: 51 additions & 3 deletions pkg/assets/bindata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55724,7 +55724,7 @@ authored by {{build.parameters.revision.git.author.name}}
<span data-icon="" aria-hidden="true" class="font-icon"></span>
</div>Ports:
<div ng-repeat="port in container.ports" style="position: relative">
<span>{{port.containerPort}} ({{port.protocol}})</span>
<span>{{port.containerPort}} ({{port.protocol}})<span ng-if="port.hostPort"> <span style="color: #ddd">&#10230;</span> {{port.hostPort}}</span></span>
<span class="connector connector-horizontal" style="left: -21px; top: 50%; width: 21px">
<span class="connector-endpoint" style="left: -3px"></span>
<span class="connector-line" style="top: 0px; left: 3px;width: 17px"></span>
Expand Down Expand Up @@ -56082,8 +56082,56 @@ var _views_pods_html2 = []byte(`<div ng-controller="ProjectController">
<em>{{emptyMessage}}</em>
</div>
</div>
<div style="margin-bottom: 10px" ng-repeat="pod in pods">
<h3>{{pod.metadata.name}} ({{pod.status.phase}})</h3>
<div style="margin-bottom: 10px" ng-repeat="pod in pods | orderObjectsByDate : true" class="tile">
<h2>{{pod.metadata.name}}</h2>
<div>
<span style="margin-right: 5px">Status: {{pod.status.phase}}</span>
<span ng-switch="pod.status.phase">
<span ng-switch-when="Succeeded" class="fa fa-check text-success" aria-hidden="true" style="margin-right: 5px"></span>
<span ng-switch-when="Terminated" class="fa fa-times text-danger" aria-hidden="true" style="margin-right: 5px"></span>
<span ng-switch-when="Pending" class="fa fa-refresh fa-spin" aria-hidden="true" style="margin-right: 5px"></span>
<span ng-switch-when="Running" class="fa fa-refresh text-success" aria-hidden="true" style="margin-right: 5px"></span>
</span>
</div>
<div>
Node: {{pod.status.host || 'unknown'}} <span ng-if="pod.status.hostIP && pod.status.host != pod.status.hostIP">({{pod.status.hostIP}})</span>
</div>
<div>
IP on node: {{pod.status.podIP || 'unknown'}}
</div>
<div>
Restart policy:
<span ng-if="pod.spec.restartPolicy.always">
always <span ng-if="pod.status.info.POD">(restarted {{pod.status.info.POD.restartCount}} times)</span>
</span>
<span ng-if="pod.spec.restartPolicy.onFailure">
on failure <span ng-if="pod.status.info.POD">(restarted {{pod.status.info.POD.restartCount}} times)</span>
</span>
<span ng-if="pod.spec.restartPolicy.never">
never <span ng-if="pod.status.info.POD.restartCount">(previously restarted {{pod.status.info.POD.restartCount}} times)</span>
</span>
</div>
<div ng-if="pod.spec.volumes.length">
Volumes:
<ul>
<li ng-repeat="volume in pod.spec.volumes">
<div>{{volume.name}}</div>
<div ng-if="volume.source.hostPath">
<div>Type: host path</div>
<div>Path: {{volume.source.hostPath.path}}</div>
</div>
<div ng-if="volume.source.emptyDir">Type: empty directory</div>

<div ng-if="volume.source.gcePersistentDisk">Type: GCE persistent disk</div>
<div ng-if="volume.source.gitRepo">
<div>Type: Git repository</div>
<div>Repository: {{volume.source.gitRepo.repository}}</div>
<div ng-if="volume.source.gitRepo.revision">Revision: {{volume.source.gitRepo.revision}}</div>
</div>
</li>
</ul>
</div>
<div>Pod template:</div>
<pod-template ng-init="podTemplate = pod"></pod-template>
</div>
</div>
Expand Down