Only show more button on list pages if scope.moreClick defined

Remove placeholder thumbnails from pod listing page of web ui
Show pods when there are no labels
This commit is contained in:
BC Broussard 2015-05-15 13:24:08 -07:00
parent efb42b302d
commit f62aa79cd5
3 changed files with 8767 additions and 8747 deletions

View File

@ -1,5 +1,5 @@
/*
Copyright 2014 The Kubernetes Authors All rights reserved.
Copyright 2015 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -1579,7 +1579,7 @@ func www_app_assets_css_app_css() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/assets/css/app.css", size: 37053, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/assets/css/app.css", size: 37053, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -3072,7 +3072,6 @@ app.controller('ListPodsCtrl', [
$scope.serverView = false;
$scope.headers = [
{name: '', field: 'thumb'},
{name: 'Pod', field: 'pod'},
{name: 'IP', field: 'ip'},
{name: 'Status', field: 'status'},
@ -3092,7 +3091,6 @@ app.controller('ListPodsCtrl', [
status: 'grey'
};
$scope.sortable = ['pod', 'ip', 'status'];
$scope.thumbs = 'thumb';
$scope.count = 10;
$scope.go = function(d) { $location.path('/dashboard/pods/' + d.id); };
@ -3137,18 +3135,19 @@ app.controller('ListPodsCtrl', [
});
}
Object.keys(pod.labels)
.forEach(function(key) {
if (key == 'name') {
_labels += ', ' + pod.labels[key];
}
if (key == 'uses') {
_uses += ', ' + pod.labels[key];
}
});
if (pod.labels) {
Object.keys(pod.labels)
.forEach(function(key) {
if (key == 'name') {
_labels += ', ' + pod.labels[key];
}
if (key == 'uses') {
_uses += ', ' + pod.labels[key];
}
});
}
$scope.content.push({
thumb: '"assets/img/kubernetes.svg"',
pod: pod.id,
ip: pod.currentState.podIP,
containers: _fixComma(_containers),
@ -4183,7 +4182,7 @@ func www_app_assets_js_app_js() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/assets/js/app.js", size: 79552, mode: os.FileMode(420), modTime: time.Unix(1431651247, 0)}
info := bindata_file_info{name: "www/app/assets/js/app.js", size: 79499, mode: os.FileMode(420), modTime: time.Unix(1431900597, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4225,7 +4224,7 @@ func www_app_assets_js_base_js() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/assets/js/base.js", size: 477058, mode: os.FileMode(420), modTime: time.Unix(1431651247, 0)}
info := bindata_file_info{name: "www/app/assets/js/base.js", size: 477058, mode: os.FileMode(420), modTime: time.Unix(1431900597, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4367,7 +4366,7 @@ func www_app_components_readme_md() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/components/README.md", size: 5196, mode: os.FileMode(420), modTime: time.Unix(1431651250, 0)}
info := bindata_file_info{name: "www/app/components/README.md", size: 5196, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4385,7 +4384,7 @@ func www_app_components_dashboard_readme_md() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/README.md", size: 41, mode: os.FileMode(420), modTime: time.Unix(1431651250, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/README.md", size: 41, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4402,7 +4401,7 @@ func www_app_components_dashboard_img_icons_ic_arrow_drop_down_18px_svg() (*asse
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/img/icons/ic_arrow_drop_down_18px.svg", size: 114, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/img/icons/ic_arrow_drop_down_18px.svg", size: 114, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4423,7 +4422,7 @@ func www_app_components_dashboard_img_icons_ic_arrow_drop_down_24px_svg() (*asse
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/img/icons/ic_arrow_drop_down_24px.svg", size: 166, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/img/icons/ic_arrow_drop_down_24px.svg", size: 166, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4440,7 +4439,7 @@ func www_app_components_dashboard_img_icons_ic_close_18px_svg() (*asset, error)
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/img/icons/ic_close_18px.svg", size: 215, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/img/icons/ic_close_18px.svg", size: 215, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4457,7 +4456,7 @@ func www_app_components_dashboard_img_icons_ic_close_24px_svg() (*asset, error)
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/img/icons/ic_close_24px.svg", size: 202, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/img/icons/ic_close_24px.svg", size: 202, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4534,7 +4533,7 @@ func www_app_components_dashboard_manifest_json() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/manifest.json", size: 1725, mode: os.FileMode(420), modTime: time.Unix(1431651250, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/manifest.json", size: 1725, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4551,7 +4550,7 @@ func www_app_components_dashboard_pages_footer_html() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/pages/footer.html", size: 7, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/pages/footer.html", size: 7, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4588,7 +4587,7 @@ func www_app_components_dashboard_pages_header_html() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/pages/header.html", size: 873, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/pages/header.html", size: 873, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4612,7 +4611,7 @@ func www_app_components_dashboard_pages_home_html() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/pages/home.html", size: 247, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/pages/home.html", size: 247, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4629,7 +4628,24 @@ func www_app_components_dashboard_protractor_smoke_spec_js() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/protractor/smoke.spec.js", size: 2616, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/protractor/smoke.spec.js", size: 2616, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
var _www_app_components_dashboard_test_controllers_header_spec_js = []byte(`"use strict";describe("header controller",function(){beforeEach(module("kubernetesApp.components.dashboard")),beforeEach(inject(function(e,t,o){this.rootScope=e,this.scope=e.$new(),this.location=t,spyOn(this.location,"path"),this.controller=o,this.ctrl=this.controller("HeaderCtrl",{$scope:this.scope}),this.scope.$apply()})),describe("subPages",function(){it("is defined",function(){expect(this.scope.subPages).not.toBeUndefined()}),it("is an array",function(){expect(Array.isArray(this.scope.subPages)).toBeTruthy()}),it("is not empty",function(){expect(this.scope.subPages.length).toBeGreaterThan(0)}),describe("each subPage",function(){it("has a category",function(){this.scope.subPages.forEach(function(e){expect(e.category).toBeTruthy()})}),it("has a name",function(){this.scope.subPages.forEach(function(e){expect(e.name).toBeTruthy()})}),it("has a value",function(){this.scope.subPages.forEach(function(e){expect(e.value).toBeTruthy()})})})}),describe("Pages",function(){it("does not change location on first detected change",function(){expect(this.location.path).not.toHaveBeenCalled()}),it("changes location on second detected change",function(){var e=this;this.scope.$apply(function(){e.scope.Pages="test_Pages"}),expect(this.location.path).toHaveBeenCalledWith("test_Pages")})})});`)
func www_app_components_dashboard_test_controllers_header_spec_js_bytes() ([]byte, error) {
return _www_app_components_dashboard_test_controllers_header_spec_js, nil
}
func www_app_components_dashboard_test_controllers_header_spec_js() (*asset, error) {
bytes, err := www_app_components_dashboard_test_controllers_header_spec_js_bytes()
if err != nil {
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/test/controllers/header.spec.js", size: 1293, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4680,7 +4696,7 @@ func www_app_components_dashboard_views_groups_html() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/views/groups.html", size: 1298, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/views/groups.html", size: 1298, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4704,7 +4720,7 @@ func www_app_components_dashboard_views_listevents_html() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/views/listEvents.html", size: 326, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/views/listEvents.html", size: 326, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4728,7 +4744,7 @@ func www_app_components_dashboard_views_listminions_html() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/views/listMinions.html", size: 327, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/views/listMinions.html", size: 327, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4752,7 +4768,7 @@ func www_app_components_dashboard_views_listpods_html() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/views/listPods.html", size: 324, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/views/listPods.html", size: 324, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4828,7 +4844,7 @@ func www_app_components_dashboard_views_listpodscards_html() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/views/listPodsCards.html", size: 1967, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/views/listPodsCards.html", size: 1967, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4862,7 +4878,7 @@ func www_app_components_dashboard_views_listpodsvisualizer_html() (*asset, error
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/views/listPodsVisualizer.html", size: 841, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/views/listPodsVisualizer.html", size: 841, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4886,7 +4902,7 @@ func www_app_components_dashboard_views_listreplicationcontrollers_html() (*asse
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/views/listReplicationControllers.html", size: 342, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/views/listReplicationControllers.html", size: 342, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4910,7 +4926,7 @@ func www_app_components_dashboard_views_listservices_html() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/views/listServices.html", size: 328, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/views/listServices.html", size: 328, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4936,7 +4952,7 @@ func www_app_components_dashboard_views_partials_cadvisor_html() (*asset, error)
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/views/partials/cadvisor.html", size: 443, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/views/partials/cadvisor.html", size: 443, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -4973,7 +4989,7 @@ func www_app_components_dashboard_views_partials_groupbox_html() (*asset, error)
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/views/partials/groupBox.html", size: 769, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/views/partials/groupBox.html", size: 769, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -5032,7 +5048,7 @@ func www_app_components_dashboard_views_partials_groupitem_html() (*asset, error
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/views/partials/groupItem.html", size: 2109, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/views/partials/groupItem.html", size: 2109, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -5082,7 +5098,7 @@ func www_app_components_dashboard_views_partials_podtilesbyname_html() (*asset,
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/views/partials/podTilesByName.html", size: 1287, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/views/partials/podTilesByName.html", size: 1287, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -5132,7 +5148,7 @@ func www_app_components_dashboard_views_partials_podtilesbyserver_html() (*asset
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/views/partials/podTilesByServer.html", size: 1281, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/views/partials/podTilesByServer.html", size: 1281, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -5246,7 +5262,7 @@ func www_app_components_dashboard_views_pod_html() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/views/pod.html", size: 2740, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/views/pod.html", size: 2740, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -5345,7 +5361,7 @@ func www_app_components_dashboard_views_replication_html() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/views/replication.html", size: 2187, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/views/replication.html", size: 2187, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -5459,7 +5475,7 @@ func www_app_components_dashboard_views_service_html() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/components/dashboard/views/service.html", size: 2485, mode: os.FileMode(420), modTime: time.Unix(1431651251, 0)}
info := bindata_file_info{name: "www/app/components/dashboard/views/service.html", size: 2485, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -5536,7 +5552,7 @@ func www_app_index_html() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/index.html", size: 2290, mode: os.FileMode(420), modTime: time.Unix(1431650377, 0)}
info := bindata_file_info{name: "www/app/index.html", size: 2290, mode: os.FileMode(420), modTime: time.Unix(1431887938, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -17545,7 +17561,7 @@ func www_app_shared_assets_sampledata1_json() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/shared/assets/sampleData1.json", size: 427639, mode: os.FileMode(420), modTime: time.Unix(1431651250, 0)}
info := bindata_file_info{name: "www/app/shared/assets/sampleData1.json", size: 427639, mode: os.FileMode(420), modTime: time.Unix(1431900600, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -17732,7 +17748,7 @@ func www_app_views_partials_md_table_tmpl_html() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "www/app/views/partials/md-table.tmpl.html", size: 2920, mode: os.FileMode(420), modTime: time.Unix(1429751137, 0)}
info := bindata_file_info{name: "www/app/views/partials/md-table.tmpl.html", size: 2920, mode: os.FileMode(420), modTime: time.Unix(1431888276, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -34597,6 +34613,7 @@ var _bindata = map[string]func() (*asset, error){
"www/app/components/dashboard/pages/header.html": www_app_components_dashboard_pages_header_html,
"www/app/components/dashboard/pages/home.html": www_app_components_dashboard_pages_home_html,
"www/app/components/dashboard/protractor/smoke.spec.js": www_app_components_dashboard_protractor_smoke_spec_js,
"www/app/components/dashboard/test/controllers/header.spec.js": www_app_components_dashboard_test_controllers_header_spec_js,
"www/app/components/dashboard/views/groups.html": www_app_components_dashboard_views_groups_html,
"www/app/components/dashboard/views/listEvents.html": www_app_components_dashboard_views_listevents_html,
"www/app/components/dashboard/views/listMinions.html": www_app_components_dashboard_views_listminions_html,
@ -34805,6 +34822,11 @@ var _bintree = &_bintree_t{nil, map[string]*_bintree_t{
"protractor": {nil, map[string]*_bintree_t{
"smoke.spec.js": {www_app_components_dashboard_protractor_smoke_spec_js, map[string]*_bintree_t{}},
}},
"test": {nil, map[string]*_bintree_t{
"controllers": {nil, map[string]*_bintree_t{
"header.spec.js": {www_app_components_dashboard_test_controllers_header_spec_js, map[string]*_bintree_t{}},
}},
}},
"views": {nil, map[string]*_bintree_t{
"groups.html": {www_app_components_dashboard_views_groups_html, map[string]*_bintree_t{}},
"listEvents.html": {www_app_components_dashboard_views_listevents_html, map[string]*_bintree_t{}},

View File

@ -1258,7 +1258,6 @@ app.controller('ListPodsCtrl', [
$scope.serverView = false;
$scope.headers = [
{name: '', field: 'thumb'},
{name: 'Pod', field: 'pod'},
{name: 'IP', field: 'ip'},
{name: 'Status', field: 'status'},
@ -1278,7 +1277,6 @@ app.controller('ListPodsCtrl', [
status: 'grey'
};
$scope.sortable = ['pod', 'ip', 'status'];
$scope.thumbs = 'thumb';
$scope.count = 10;
$scope.go = function(d) { $location.path('/dashboard/pods/' + d.id); };
@ -1323,18 +1321,19 @@ app.controller('ListPodsCtrl', [
});
}
Object.keys(pod.labels)
.forEach(function(key) {
if (key == 'name') {
_labels += ', ' + pod.labels[key];
}
if (key == 'uses') {
_uses += ', ' + pod.labels[key];
}
});
if (pod.labels) {
Object.keys(pod.labels)
.forEach(function(key) {
if (key == 'name') {
_labels += ', ' + pod.labels[key];
}
if (key == 'uses') {
_uses += ', ' + pod.labels[key];
}
});
}
$scope.content.push({
thumb: '"assets/img/kubernetes.svg"',
pod: pod.id,
ip: pod.currentState.podIP,
containers: _fixComma(_containers),

View File

@ -16,7 +16,6 @@ app.controller('ListPodsCtrl', [
$scope.serverView = false;
$scope.headers = [
{name: '', field: 'thumb'},
{name: 'Pod', field: 'pod'},
{name: 'IP', field: 'ip'},
{name: 'Status', field: 'status'},
@ -36,7 +35,6 @@ app.controller('ListPodsCtrl', [
status: 'grey'
};
$scope.sortable = ['pod', 'ip', 'status'];
$scope.thumbs = 'thumb';
$scope.count = 10;
$scope.go = function(d) { $location.path('/dashboard/pods/' + d.id); };
@ -81,18 +79,19 @@ app.controller('ListPodsCtrl', [
});
}
Object.keys(pod.labels)
.forEach(function(key) {
if (key == 'name') {
_labels += ', ' + pod.labels[key];
}
if (key == 'uses') {
_uses += ', ' + pod.labels[key];
}
});
if (pod.labels) {
Object.keys(pod.labels)
.forEach(function(key) {
if (key == 'name') {
_labels += ', ' + pod.labels[key];
}
if (key == 'uses') {
_uses += ', ' + pod.labels[key];
}
});
}
$scope.content.push({
thumb: '"assets/img/kubernetes.svg"',
pod: pod.id,
ip: pod.currentState.podIP,
containers: _fixComma(_containers),