Skip to content

Status icons for Pods visible on list and resources pages #784

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
Jun 1, 2016
Merged

Status icons for Pods visible on list and resources pages #784

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: 2 additions & 0 deletions i18n/messages-en.xtb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@
<translation id="4426583640675024823" key="MSG_DEPLOY_SETTINGS_RUN_PRIVILEGED_USER_HELP" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="User help for the &quot;Run as privileged&quot; checkbox input on the deploy from settings page.">Processes in privileged containers are equivalent to processes running as root on the host.</translation>
<translation id="7560440547757208994" key="MSG_DEPLOY_SETTINGS_ENV_VARIABLES_USER_HELP" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="User help for the &quot;Environment variables&quot; section on the deploy from settings page.">Environment variables available for use in the container. Values can reference other variables using $(VAR_NAME) syntax.</translation>
<translation id="7026295428726247109" key="MSG_DEPLOY_SETTINGS_NUMBER_OF_PODS_INT_WARNING" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Appears to tell the user that the number of pods on the deploy from settings page must be non-negative or integer.">Number of pods must be a positive integer</translation>
<translation id="3664340326455185585" key="MSG_POD_IS_FAILED_TOOLTIP" source="/home/denis/Projects/dashboard/.tmp/serve/app-dev.js" desc="tooltip for failed pod card icon">This pod has errors.</translation>
<translation id="6223633459559529643" key="MSG_POD_IS_PENDING_TOOLTIP" source="/home/denis/Projects/dashboard/.tmp/serve/app-dev.js" desc="tooltip for pending pod card icon">This pod is in a pending state.</translation>
<translation id="750172492346654392" key="MSG_DEPLOY_PAGE_TITLE" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Title text which appears on top of the deploy page.">Deploy a Containerized App</translation>
<translation id="4849906879961443302" key="MSG_DEPLOY_SPECIFY_APP_DETAILS_ACTION" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Text for a selection option, which the user must click to manually enter the app details on the deploy page.">Specify app details below</translation>
<translation id="6920937028819232874" key="MSG_DEPLOY_FILE_UPLOAD_ACTION" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Text for a selection option, which the user must click to upload a YAML/JSON file to deploy from on the deploy page.">Upload a YAML or JSON file</translation>
Expand Down
2 changes: 2 additions & 0 deletions i18n/messages-ja.xtb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@
<translation id="4426583640675024823" key="MSG_DEPLOY_SETTINGS_RUN_PRIVILEGED_USER_HELP" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="User help for the &quot;Run as privileged&quot; checkbox input on the deploy from settings page.">Processes in privileged containers are equivalent to processes running as root on the host.</translation>
<translation id="7560440547757208994" key="MSG_DEPLOY_SETTINGS_ENV_VARIABLES_USER_HELP" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="User help for the &quot;Environment variables&quot; section on the deploy from settings page.">Environment variables available for use in the container. Values can reference other variables using $(VAR_NAME) syntax.</translation>
<translation id="7026295428726247109" key="MSG_DEPLOY_SETTINGS_NUMBER_OF_PODS_INT_WARNING" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Appears to tell the user that the number of pods on the deploy from settings page must be non-negative or integer.">Number of pods must be a positive integer</translation>
<translation id="3664340326455185585" key="MSG_POD_IS_FAILED_TOOLTIP" source="/home/denis/Projects/dashboard/.tmp/serve/app-dev.js" desc="tooltip for failed pod card icon">This pod has errors.</translation>
<translation id="6223633459559529643" key="MSG_POD_IS_PENDING_TOOLTIP" source="/home/denis/Projects/dashboard/.tmp/serve/app-dev.js" desc="tooltip for pending pod card icon">This pod is in a pending state.</translation>
<translation id="750172492346654392" key="MSG_DEPLOY_PAGE_TITLE" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Title text which appears on top of the deploy page.">Deploy a Containerized App</translation>
<translation id="4849906879961443302" key="MSG_DEPLOY_SPECIFY_APP_DETAILS_ACTION" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Text for a selection option, which the user must click to manually enter the app details on the deploy page.">Specify app details below</translation>
<translation id="6920937028819232874" key="MSG_DEPLOY_FILE_UPLOAD_ACTION" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Text for a selection option, which the user must click to upload a YAML/JSON file to deploy from on the deploy page.">Upload a YAML or JSON file</translation>
Expand Down
13 changes: 13 additions & 0 deletions src/app/frontend/podlist/podcardlist.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,19 @@

<kd-resource-card ng-repeat="pod in $ctrl.podList.pods"
type-meta="pod.typeMeta" object-meta="pod.objectMeta">
<kd-resource-card-status layout="row">
<md-icon class="material-icons kd-error" ng-if="::pod.podPhase=='Failed'">
error
<md-tooltip md-direction="right">{{::$ctrl.i18n.MSG_POD_IS_FAILED_TOOLTIP}}</md-tooltip>
</md-icon>
<md-icon class="material-icons" ng-if="::pod.podPhase=='Pending'">
timelapse
<md-tooltip md-direction="right">{{::$ctrl.i18n.MSG_POD_IS_PENDING_TOOLTIP}}</md-tooltip>
</md-icon>
<md-icon class="material-icons kd-success" ng-if="::pod.podPhase=='Running'">
beenhere
</md-icon>
</kd-resource-card-status>
<kd-resource-card-columns>
<kd-resource-card-column>
<div>
Expand Down
13 changes: 13 additions & 0 deletions src/app/frontend/podlist/podcardlist_component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ export class PodCardListController {

/** @private {!ui.router.$state} */
this.state_ = $state;

/**
* @export
*/
this.i18n = i18n;
}

/**
Expand Down Expand Up @@ -77,3 +82,11 @@ export const podCardListComponent = {
'withStatuses': '<',
},
};

const i18n = {
/** @export {string} @desc tooltip for failed pod card icon */
MSG_POD_IS_FAILED_TOOLTIP: goog.getMsg('This pod has errors.'),

/** @export {string} @desc tooltip for pending pod card icon */
MSG_POD_IS_PENDING_TOOLTIP: goog.getMsg('This pod is in a pending state.'),
};
2 changes: 1 addition & 1 deletion src/app/frontend/podlist/podlist.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
-->
<kd-content-card>
<kd-content>
<kd-pod-card-list pod-list="$ctrl.podList">
<kd-pod-card-list pod-list="$ctrl.podList" with-statuses="true">
</kd-pod-card-list>
</kd-content>
</kd-content-card>
2 changes: 1 addition & 1 deletion src/app/frontend/replicasetdetail/replicasetdetail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<kd-title>Pods</kd-title>
<kd-content>
<kd-pod-card-list pod-list="::ctrl.replicaSetDetail.podList"
logs-href-fn="::ctrl.getPodLogsHref(pod)">
logs-href-fn="::ctrl.getPodLogsHref(pod)" with-statuses="true">
</kd-pod-card-list>
</kd-content>
</kd-content-card>
Expand Down
2 changes: 1 addition & 1 deletion src/app/frontend/replicationcontrollerdetail/replicationcontrollerdetail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<kd-title>Pods</kd-title>
<kd-content>
<kd-pod-card-list pod-list="::ctrl.replicationControllerDetail.pods"
logs-href-fn="::ctrl.getPodLogsHref(pod)">
logs-href-fn="::ctrl.getPodLogsHref(pod)" with-statuses="true">
</kd-pod-card-list>
</kd-content>
</kd-content-card>
Expand Down
2 changes: 1 addition & 1 deletion src/app/frontend/servicedetail/servicedetail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<kd-content-card ng-if="ctrl.serviceDetail.podList.pods.length">
<kd-title>Pods</kd-title>
<kd-content>
<kd-pod-card-list pod-list="ctrl.serviceDetail.podList"></kd-pod-card-list>
<kd-pod-card-list pod-list="ctrl.serviceDetail.podList" with-statuses="true"></kd-pod-card-list>
</kd-content>
</kd-content-card>
2 changes: 1 addition & 1 deletion src/app/frontend/workloads/workloads.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
</a>
</kd-title>
<kd-content>
<kd-pod-card-list pod-list="$ctrl.workloads.podList">
<kd-pod-card-list pod-list="$ctrl.workloads.podList" with-statuses="true">
</kd-pod-card-list>
</kd-content>
</kd-content-card>