diff --git a/pkg/ui/datafile.go b/pkg/ui/datafile.go index 4531090491..1f66b404cc 100644 --- a/pkg/ui/datafile.go +++ b/pkg/ui/datafile.go @@ -1592,7 +1592,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: 37661, mode: os.FileMode(420), modTime: time.Unix(1433398110, 0)} + info := bindata_file_info{name: "www/app/assets/css/app.css", size: 37661, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2124,8 +2124,7 @@ angular.module("kubernetesApp.config", []) .constant("ENV", { "/": { - "k8sApiServer": "/api/v1beta2", - "k8sApiv1beta3Server": "/api/v1beta3", + "k8sApiServer": "/api/v1beta3", "k8sDataServer": "/cluster", "k8sDataPollMinIntervalSec": 10, "k8sDataPollMaxIntervalSec": 120, @@ -2493,51 +2492,6 @@ app.controller('TabCtrl', [ })(); app.provider('k8sApi', - function() { - - var urlBase = ''; - - this.setUrlBase = function(value) { urlBase = value; }; - - var _get = function($http, baseUrl, query) { - var _fullUrl = baseUrl; - if (query !== undefined) { - _fullUrl += '/' + query; - } - - return $http.get(_fullUrl); - }; - - this.$get = ["$http", "$q", function($http, $q) { - var api = {}; - - api.getUrlBase = function() { return urlBase; }; - - api.getPods = function(query) { return _get($http, urlBase + '/pods', query); }; - - api.getMinions = function(query) { return _get($http, urlBase + '/nodes', query); }; - - api.getNodes = api.getMinions; - - api.getServices = function(query) { return _get($http, urlBase + '/services', query); }; - - api.getReplicationControllers = function(query) { - return _get($http, urlBase + '/replicationControllers', query) - }; - - api.getEvents = function(query) { return _get($http, urlBase + '/events', query); }; - - return api; - }]; - }) - .config(["k8sApiProvider", "ENV", function(k8sApiProvider, ENV) { - if (ENV && ENV['/'] && ENV['/']['k8sApiServer']) { - var proxy = ENV['/']['cAdvisorProxy'] || ''; - k8sApiProvider.setUrlBase(proxy + ENV['/']['k8sApiServer']); - } - }]); - -app.provider('k8sv1Beta3Api', function() { var urlBase = ''; @@ -2580,10 +2534,9 @@ app.provider('k8sv1Beta3Api', return api; }]; }) - .config(["k8sv1Beta3ApiProvider", "ENV", function(k8sv1Beta3ApiProvider, ENV) { - if (ENV && ENV['/'] && ENV['/']['k8sApiv1beta3Server']) { - var proxy = ENV['/']['cAdvisorProxy'] || ''; - k8sv1Beta3ApiProvider.setUrlBase(proxy + ENV['/']['k8sApiv1beta3Server']); + .config(["k8sApiProvider", "ENV", function(k8sApiProvider, ENV) { + if (ENV && ENV['/'] && ENV['/']['k8sApiServer']) { + k8sApiProvider.setUrlBase(ENV['/']['k8sApiServer']); } }]); @@ -2784,7 +2737,7 @@ app.provider('k8sv1Beta3Api', app.controller('cAdvisorController', [ '$scope', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', 'lodash', 'cAdvisorService', '$q', @@ -2983,7 +2936,7 @@ app.controller('GroupCtrl', [ '$route', '$interval', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$rootScope', '$location', 'lodash', @@ -3233,7 +3186,7 @@ angular.module('kubernetesApp.components.dashboard', []) app.controller('ListEventsCtrl', [ '$scope', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$location', '$filter', function($scope, $routeParams, k8sApi, $location, $filter) { @@ -3319,7 +3272,7 @@ app.controller('ListEventsCtrl', [ app.controller('ListMinionsCtrl', [ '$scope', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$location', function($scope, $routeParams, k8sApi, $location) { 'use strict'; @@ -3389,7 +3342,7 @@ app.controller('ListMinionsCtrl', [ app.controller('ListPodsCtrl', [ '$scope', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', 'lodash', '$location', function($scope, $routeParams, k8sApi, lodash, $location) { @@ -3524,7 +3477,7 @@ app.controller('ListPodsCtrl', [ app.controller('ListReplicationControllersCtrl', [ '$scope', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$location', function($scope, $routeParams, k8sApi, $location) { 'use strict'; @@ -3621,7 +3574,7 @@ app.controller('ListServicesCtrl', [ '$scope', '$interval', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$rootScope', '$location', function($scope, $interval, $routeParams, k8sApi, $rootScope, $location) { @@ -3730,7 +3683,7 @@ app.controller('NodeCtrl', [ '$scope', '$interval', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$rootScope', function($scope, $interval, $routeParams, k8sApi, $rootScope) { 'use strict'; @@ -3764,7 +3717,7 @@ app.controller('PodCtrl', [ '$scope', '$interval', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$rootScope', function($scope, $interval, $routeParams, k8sApi, $rootScope) { 'use strict'; @@ -3813,7 +3766,7 @@ ReplicationController.prototype.handleError = function(data, status, headers, co app.controller('ReplicationControllerCtrl', [ '$scope', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', function($scope, $routeParams, k8sApi) { $scope.controller = new ReplicationController(); $scope.controller.k8sApi = k8sApi; @@ -3850,7 +3803,7 @@ ServiceController.prototype.handleError = function(data, status, headers, config app.controller('ServiceCtrl', [ '$scope', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$location', function($scope, $routeParams, k8sApi, $location) { $scope.controller = new ServiceController(); @@ -4676,7 +4629,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: 93271, mode: os.FileMode(420), modTime: time.Unix(1433398106, 0)} + info := bindata_file_info{name: "www/app/assets/js/app.js", size: 91495, mode: os.FileMode(420), modTime: time.Unix(1433402214, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4718,7 +4671,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: 477048, mode: os.FileMode(420), modTime: time.Unix(1433398106, 0)} + info := bindata_file_info{name: "www/app/assets/js/base.js", size: 477048, mode: os.FileMode(420), modTime: time.Unix(1433402087, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4735,7 +4688,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(1433398110, 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(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4756,7 +4709,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(1433398110, 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(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4773,7 +4726,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(1433398110, 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(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4790,7 +4743,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(1433398110, 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(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4872,7 +4825,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: 1854, mode: os.FileMode(420), modTime: time.Unix(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/manifest.json", size: 1854, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4889,7 +4842,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(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/pages/footer.html", size: 7, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4932,7 +4885,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: 1313, mode: os.FileMode(420), modTime: time.Unix(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/pages/header.html", size: 1313, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4956,7 +4909,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(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/pages/home.html", size: 247, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4973,7 +4926,7 @@ 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(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/protractor/smoke.spec.js", size: 2616, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -4990,7 +4943,7 @@ func www_app_components_dashboard_test_controllers_header_spec_js() (*asset, err 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(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/test/controllers/header.spec.js", size: 1293, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5041,7 +4994,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(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/views/groups.html", size: 1298, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5065,7 +5018,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(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/views/listEvents.html", size: 326, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5089,7 +5042,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: 348, mode: os.FileMode(420), modTime: time.Unix(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/views/listMinions.html", size: 348, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5113,7 +5066,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: 345, mode: os.FileMode(420), modTime: time.Unix(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/views/listPods.html", size: 345, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5189,7 +5142,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(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/views/listPodsCards.html", size: 1967, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5223,7 +5176,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(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/views/listPodsVisualizer.html", size: 841, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5247,7 +5200,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: 363, mode: os.FileMode(420), modTime: time.Unix(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/views/listReplicationControllers.html", size: 363, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5271,7 +5224,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: 349, mode: os.FileMode(420), modTime: time.Unix(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/views/listServices.html", size: 349, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5377,7 +5330,7 @@ func www_app_components_dashboard_views_node_html() (*asset, error) { return nil, err } - info := bindata_file_info{name: "www/app/components/dashboard/views/node.html", size: 2307, mode: os.FileMode(420), modTime: time.Unix(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/views/node.html", size: 2307, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5403,7 +5356,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: 454, mode: os.FileMode(420), modTime: time.Unix(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/views/partials/cadvisor.html", size: 454, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5440,7 +5393,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(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/views/partials/groupBox.html", size: 769, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5499,7 +5452,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: 2213, mode: os.FileMode(420), modTime: time.Unix(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/views/partials/groupItem.html", size: 2213, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5549,7 +5502,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(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/views/partials/podTilesByName.html", size: 1287, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5599,7 +5552,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(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/views/partials/podTilesByServer.html", size: 1281, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5730,7 +5683,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: 4149, mode: os.FileMode(420), modTime: time.Unix(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/views/pod.html", size: 4149, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5847,7 +5800,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: 3207, mode: os.FileMode(420), modTime: time.Unix(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/views/replication.html", size: 3207, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -5978,7 +5931,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: 3539, mode: os.FileMode(420), modTime: time.Unix(1433398110, 0)} + info := bindata_file_info{name: "www/app/components/dashboard/views/service.html", size: 3539, mode: os.FileMode(420), modTime: time.Unix(1433402091, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/www/app/assets/js/app.js b/www/app/assets/js/app.js index 71af76ae62..118c66cbbe 100644 --- a/www/app/assets/js/app.js +++ b/www/app/assets/js/app.js @@ -200,8 +200,7 @@ angular.module("kubernetesApp.config", []) .constant("ENV", { "/": { - "k8sApiServer": "/api/v1beta2", - "k8sApiv1beta3Server": "/api/v1beta3", + "k8sApiServer": "/api/v1beta3", "k8sDataServer": "/cluster", "k8sDataPollMinIntervalSec": 10, "k8sDataPollMaxIntervalSec": 120, @@ -569,51 +568,6 @@ app.controller('TabCtrl', [ })(); app.provider('k8sApi', - function() { - - var urlBase = ''; - - this.setUrlBase = function(value) { urlBase = value; }; - - var _get = function($http, baseUrl, query) { - var _fullUrl = baseUrl; - if (query !== undefined) { - _fullUrl += '/' + query; - } - - return $http.get(_fullUrl); - }; - - this.$get = ["$http", "$q", function($http, $q) { - var api = {}; - - api.getUrlBase = function() { return urlBase; }; - - api.getPods = function(query) { return _get($http, urlBase + '/pods', query); }; - - api.getMinions = function(query) { return _get($http, urlBase + '/nodes', query); }; - - api.getNodes = api.getMinions; - - api.getServices = function(query) { return _get($http, urlBase + '/services', query); }; - - api.getReplicationControllers = function(query) { - return _get($http, urlBase + '/replicationControllers', query) - }; - - api.getEvents = function(query) { return _get($http, urlBase + '/events', query); }; - - return api; - }]; - }) - .config(["k8sApiProvider", "ENV", function(k8sApiProvider, ENV) { - if (ENV && ENV['/'] && ENV['/']['k8sApiServer']) { - var proxy = ENV['/']['cAdvisorProxy'] || ''; - k8sApiProvider.setUrlBase(proxy + ENV['/']['k8sApiServer']); - } - }]); - -app.provider('k8sv1Beta3Api', function() { var urlBase = ''; @@ -656,10 +610,9 @@ app.provider('k8sv1Beta3Api', return api; }]; }) - .config(["k8sv1Beta3ApiProvider", "ENV", function(k8sv1Beta3ApiProvider, ENV) { - if (ENV && ENV['/'] && ENV['/']['k8sApiv1beta3Server']) { - var proxy = ENV['/']['cAdvisorProxy'] || ''; - k8sv1Beta3ApiProvider.setUrlBase(proxy + ENV['/']['k8sApiv1beta3Server']); + .config(["k8sApiProvider", "ENV", function(k8sApiProvider, ENV) { + if (ENV && ENV['/'] && ENV['/']['k8sApiServer']) { + k8sApiProvider.setUrlBase(ENV['/']['k8sApiServer']); } }]); @@ -860,7 +813,7 @@ app.provider('k8sv1Beta3Api', app.controller('cAdvisorController', [ '$scope', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', 'lodash', 'cAdvisorService', '$q', @@ -1059,7 +1012,7 @@ app.controller('GroupCtrl', [ '$route', '$interval', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$rootScope', '$location', 'lodash', @@ -1309,7 +1262,7 @@ angular.module('kubernetesApp.components.dashboard', []) app.controller('ListEventsCtrl', [ '$scope', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$location', '$filter', function($scope, $routeParams, k8sApi, $location, $filter) { @@ -1395,7 +1348,7 @@ app.controller('ListEventsCtrl', [ app.controller('ListMinionsCtrl', [ '$scope', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$location', function($scope, $routeParams, k8sApi, $location) { 'use strict'; @@ -1465,7 +1418,7 @@ app.controller('ListMinionsCtrl', [ app.controller('ListPodsCtrl', [ '$scope', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', 'lodash', '$location', function($scope, $routeParams, k8sApi, lodash, $location) { @@ -1600,7 +1553,7 @@ app.controller('ListPodsCtrl', [ app.controller('ListReplicationControllersCtrl', [ '$scope', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$location', function($scope, $routeParams, k8sApi, $location) { 'use strict'; @@ -1697,7 +1650,7 @@ app.controller('ListServicesCtrl', [ '$scope', '$interval', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$rootScope', '$location', function($scope, $interval, $routeParams, k8sApi, $rootScope, $location) { @@ -1806,7 +1759,7 @@ app.controller('NodeCtrl', [ '$scope', '$interval', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$rootScope', function($scope, $interval, $routeParams, k8sApi, $rootScope) { 'use strict'; @@ -1840,7 +1793,7 @@ app.controller('PodCtrl', [ '$scope', '$interval', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$rootScope', function($scope, $interval, $routeParams, k8sApi, $rootScope) { 'use strict'; @@ -1889,7 +1842,7 @@ ReplicationController.prototype.handleError = function(data, status, headers, co app.controller('ReplicationControllerCtrl', [ '$scope', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', function($scope, $routeParams, k8sApi) { $scope.controller = new ReplicationController(); $scope.controller.k8sApi = k8sApi; @@ -1926,7 +1879,7 @@ ServiceController.prototype.handleError = function(data, status, headers, config app.controller('ServiceCtrl', [ '$scope', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$location', function($scope, $routeParams, k8sApi, $location) { $scope.controller = new ServiceController(); diff --git a/www/master/components/dashboard/js/modules/controllers/cAdvisorController.js b/www/master/components/dashboard/js/modules/controllers/cAdvisorController.js index 93afdc9967..0cbe813bcc 100644 --- a/www/master/components/dashboard/js/modules/controllers/cAdvisorController.js +++ b/www/master/components/dashboard/js/modules/controllers/cAdvisorController.js @@ -3,7 +3,7 @@ app.controller('cAdvisorController', [ '$scope', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', 'lodash', 'cAdvisorService', '$q', diff --git a/www/master/components/dashboard/js/modules/controllers/groupController.js b/www/master/components/dashboard/js/modules/controllers/groupController.js index 79d4ee83b9..1701a69879 100644 --- a/www/master/components/dashboard/js/modules/controllers/groupController.js +++ b/www/master/components/dashboard/js/modules/controllers/groupController.js @@ -8,7 +8,7 @@ app.controller('GroupCtrl', [ '$route', '$interval', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$rootScope', '$location', 'lodash', diff --git a/www/master/components/dashboard/js/modules/controllers/listEventsController.js b/www/master/components/dashboard/js/modules/controllers/listEventsController.js index 3e9f9ae90b..6308fde404 100644 --- a/www/master/components/dashboard/js/modules/controllers/listEventsController.js +++ b/www/master/components/dashboard/js/modules/controllers/listEventsController.js @@ -6,7 +6,7 @@ app.controller('ListEventsCtrl', [ '$scope', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$location', '$filter', function($scope, $routeParams, k8sApi, $location, $filter) { diff --git a/www/master/components/dashboard/js/modules/controllers/listMinionsController.js b/www/master/components/dashboard/js/modules/controllers/listMinionsController.js index b0c89cab88..1a44169c2e 100644 --- a/www/master/components/dashboard/js/modules/controllers/listMinionsController.js +++ b/www/master/components/dashboard/js/modules/controllers/listMinionsController.js @@ -6,7 +6,7 @@ app.controller('ListMinionsCtrl', [ '$scope', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$location', function($scope, $routeParams, k8sApi, $location) { 'use strict'; diff --git a/www/master/components/dashboard/js/modules/controllers/listPodsController.js b/www/master/components/dashboard/js/modules/controllers/listPodsController.js index bdcfe3b3d8..f2f6dee16c 100644 --- a/www/master/components/dashboard/js/modules/controllers/listPodsController.js +++ b/www/master/components/dashboard/js/modules/controllers/listPodsController.js @@ -3,7 +3,7 @@ app.controller('ListPodsCtrl', [ '$scope', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', 'lodash', '$location', function($scope, $routeParams, k8sApi, lodash, $location) { diff --git a/www/master/components/dashboard/js/modules/controllers/listReplicationControllersController.js b/www/master/components/dashboard/js/modules/controllers/listReplicationControllersController.js index dff6530533..4609bbab63 100644 --- a/www/master/components/dashboard/js/modules/controllers/listReplicationControllersController.js +++ b/www/master/components/dashboard/js/modules/controllers/listReplicationControllersController.js @@ -6,7 +6,7 @@ app.controller('ListReplicationControllersCtrl', [ '$scope', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$location', function($scope, $routeParams, k8sApi, $location) { 'use strict'; diff --git a/www/master/components/dashboard/js/modules/controllers/listServicesController.js b/www/master/components/dashboard/js/modules/controllers/listServicesController.js index 0fada5198b..125bda5830 100644 --- a/www/master/components/dashboard/js/modules/controllers/listServicesController.js +++ b/www/master/components/dashboard/js/modules/controllers/listServicesController.js @@ -7,7 +7,7 @@ app.controller('ListServicesCtrl', [ '$scope', '$interval', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$rootScope', '$location', function($scope, $interval, $routeParams, k8sApi, $rootScope, $location) { diff --git a/www/master/components/dashboard/js/modules/controllers/nodeController.js b/www/master/components/dashboard/js/modules/controllers/nodeController.js index 0c045827e4..da8f550543 100644 --- a/www/master/components/dashboard/js/modules/controllers/nodeController.js +++ b/www/master/components/dashboard/js/modules/controllers/nodeController.js @@ -7,7 +7,7 @@ app.controller('NodeCtrl', [ '$scope', '$interval', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$rootScope', function($scope, $interval, $routeParams, k8sApi, $rootScope) { 'use strict'; diff --git a/www/master/components/dashboard/js/modules/controllers/podController.js b/www/master/components/dashboard/js/modules/controllers/podController.js index c1afbacb1f..e598edcb35 100644 --- a/www/master/components/dashboard/js/modules/controllers/podController.js +++ b/www/master/components/dashboard/js/modules/controllers/podController.js @@ -7,7 +7,7 @@ app.controller('PodCtrl', [ '$scope', '$interval', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$rootScope', function($scope, $interval, $routeParams, k8sApi, $rootScope) { 'use strict'; diff --git a/www/master/components/dashboard/js/modules/controllers/replicationController.js b/www/master/components/dashboard/js/modules/controllers/replicationController.js index 60366ec8cf..933c209428 100644 --- a/www/master/components/dashboard/js/modules/controllers/replicationController.js +++ b/www/master/components/dashboard/js/modules/controllers/replicationController.js @@ -22,7 +22,7 @@ ReplicationController.prototype.handleError = function(data, status, headers, co app.controller('ReplicationControllerCtrl', [ '$scope', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', function($scope, $routeParams, k8sApi) { $scope.controller = new ReplicationController(); $scope.controller.k8sApi = k8sApi; diff --git a/www/master/components/dashboard/js/modules/controllers/serviceController.js b/www/master/components/dashboard/js/modules/controllers/serviceController.js index d8cb6a0102..04e7b81da0 100644 --- a/www/master/components/dashboard/js/modules/controllers/serviceController.js +++ b/www/master/components/dashboard/js/modules/controllers/serviceController.js @@ -22,7 +22,7 @@ ServiceController.prototype.handleError = function(data, status, headers, config app.controller('ServiceCtrl', [ '$scope', '$routeParams', - 'k8sv1Beta3Api', + 'k8sApi', '$location', function($scope, $routeParams, k8sApi, $location) { $scope.controller = new ServiceController(); diff --git a/www/master/shared/config/development.json b/www/master/shared/config/development.json index bf02f7d84e..5f9b3ddf65 100644 --- a/www/master/shared/config/development.json +++ b/www/master/shared/config/development.json @@ -1,6 +1,5 @@ { - "k8sApiServer": "/api/v1beta2", - "k8sApiv1beta3Server": "/api/v1beta3", + "k8sApiServer": "/api/v1beta3", "k8sDataServer": "/cluster", "k8sDataPollMinIntervalSec": 10, "k8sDataPollMaxIntervalSec": 120, diff --git a/www/master/shared/config/generated-config.js b/www/master/shared/config/generated-config.js index 254bc5db04..5b1e2a93d3 100644 --- a/www/master/shared/config/generated-config.js +++ b/www/master/shared/config/generated-config.js @@ -2,8 +2,7 @@ angular.module("kubernetesApp.config", []) .constant("ENV", { "/": { - "k8sApiServer": "/api/v1beta2", - "k8sApiv1beta3Server": "/api/v1beta3", + "k8sApiServer": "/api/v1beta3", "k8sDataServer": "/cluster", "k8sDataPollMinIntervalSec": 10, "k8sDataPollMaxIntervalSec": 120, diff --git a/www/master/shared/js/modules/services/k8sApiService.js b/www/master/shared/js/modules/services/k8sApiService.js index 221891fb5a..92ad49ad26 100644 --- a/www/master/shared/js/modules/services/k8sApiService.js +++ b/www/master/shared/js/modules/services/k8sApiService.js @@ -1,49 +1,4 @@ app.provider('k8sApi', - function() { - - var urlBase = ''; - - this.setUrlBase = function(value) { urlBase = value; }; - - var _get = function($http, baseUrl, query) { - var _fullUrl = baseUrl; - if (query !== undefined) { - _fullUrl += '/' + query; - } - - return $http.get(_fullUrl); - }; - - this.$get = function($http, $q) { - var api = {}; - - api.getUrlBase = function() { return urlBase; }; - - api.getPods = function(query) { return _get($http, urlBase + '/pods', query); }; - - api.getMinions = function(query) { return _get($http, urlBase + '/nodes', query); }; - - api.getNodes = api.getMinions; - - api.getServices = function(query) { return _get($http, urlBase + '/services', query); }; - - api.getReplicationControllers = function(query) { - return _get($http, urlBase + '/replicationControllers', query) - }; - - api.getEvents = function(query) { return _get($http, urlBase + '/events', query); }; - - return api; - }; - }) - .config(function(k8sApiProvider, ENV) { - if (ENV && ENV['/'] && ENV['/']['k8sApiServer']) { - var proxy = ENV['/']['cAdvisorProxy'] || ''; - k8sApiProvider.setUrlBase(proxy + ENV['/']['k8sApiServer']); - } - }); - -app.provider('k8sv1Beta3Api', function() { var urlBase = ''; @@ -86,9 +41,8 @@ app.provider('k8sv1Beta3Api', return api; }; }) - .config(function(k8sv1Beta3ApiProvider, ENV) { - if (ENV && ENV['/'] && ENV['/']['k8sApiv1beta3Server']) { - var proxy = ENV['/']['cAdvisorProxy'] || ''; - k8sv1Beta3ApiProvider.setUrlBase(proxy + ENV['/']['k8sApiv1beta3Server']); + .config(function(k8sApiProvider, ENV) { + if (ENV && ENV['/'] && ENV['/']['k8sApiServer']) { + k8sApiProvider.setUrlBase(ENV['/']['k8sApiServer']); } });