' + build.displayName + '
' + - 'duration: ' + y + ' seconds
'; - if (date) { - tooltip += 'started: ' + date + '
'; - } - if (result) { - tooltip += 'result: ' + result + '
'; - } - if (x) { - var data = buildsSucceeded; - var key = successBuildKey; - if (!successBuildKey && (!result || !result.startsWith("SUCC"))) { - data = buildsFailed; - key = failedBuildKey; - } - data.push({ - tooltip: tooltip, - color: color, - x: x, y: y }); - } - }); - $scope.data = []; - if (buildsSucceeded.length) { - $scope.data.push({ - key: successBuildKey, - values: buildsSucceeded - }); - } - if (buildsFailed.length) { - $scope.data.push({ - key: failedBuildKey, - values: buildsFailed - }); - } - $scope.api.updateWithData($scope.data); - $timeout(function () { - $scope.api.update(); - }, 50); - } function updateData() { - var metricsPath = $scope.jobId ? UrlHelpers.join("job", $scope.jobId, "fabric8/metrics") : "fabric8/metrics"; - var url = Kubernetes.kubernetesProxyUrlForServiceCurrentNamespace(Developer.jenkinsServiceNameAndPort, metricsPath); - Developer.log.info(""); - if (url && (!$scope.jenkins || Kubernetes.keepPollingModel)) { - $http.get(url, Developer.jenkinsHttpConfig). + $scope.item = null; + if ($scope.id) { + var url = Kubernetes.deploymentConfigRestUrl($scope.id); + $http.get(url). success(function (data, status, headers, config) { if (data) { - if (Developer.hasObjectChanged(data, $scope.entityChangedCache)) { - Developer.log.info("entity has changed!"); - $scope.metrics = data; - updateChartData(); - } + $scope.entity = data; + Kubernetes.enrichDeploymentConfig(data); } - $scope.model.fetched = true; + $scope.fetched = true; Core.$apply($scope); }). error(function (data, status, headers, config) { - Developer.log.warn("Failed to load " + url + " " + data + " " + status); + Kubernetes.log.warn("Failed to load " + url + " " + data + " " + status); }); } - } - }]); -})(Developer || (Developer = {})); - -///\n {
- pages: {
- Source: {
- controls: ["source"]
- },
- Revision: {
- controls: ["revision"]
- },
- Output: {
- controls: ["output"]
- },
- Resources: {
- controls: ["resources"]
- },
- Strategy: {
- controls: ["strategy"]
- },
- Triggers: {
- controls: ["triggers"]
- },
- "Service Account": {
- controls: ["serviceAccount"]
- }
- }
- };
- */
- $scope.entity = {
- "apiVersion": "v1",
- "kind": "BuildConfig",
- "metadata": {
- "name": "",
- "labels": {}
+ "kubernetes_AWSElasticBlockStoreVolumeSource": {
+ "type": "object",
+ "description": "",
+ "properties": {
+ "fsType": {
+ "type": "string",
+ "description": "file system type to mount"
+ },
+ "partition": {
+ "type": "integer",
+ "description": "partition on the disk to mount (e.g."
+ },
+ "readOnly": {
+ "type": "boolean",
+ "description": "read-only if true"
+ },
+ "volumeID": {
+ "type": "string",
+ "description": "unique id of the PD resource in AWS; see http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore"
+ }
+ },
+ "additionalProperties": true,
+ "javaType": "io.fabric8.kubernetes.api.model.AWSElasticBlockStoreVolumeSource"
},
- "spec": {
- "source": {
- "type": "Git"
+ "kubernetes_Capabilities": {
+ "type": "object",
+ "description": "",
+ "properties": {
+ "add": {
+ "type": "array",
+ "description": "added capabilities",
+ "items": {
+ "type": "string",
+ "description": "added capabilities"
+ }
+ },
+ "drop": {
+ "type": "array",
+ "description": "droped capabilities",
+ "items": {
+ "type": "string",
+ "description": "droped capabilities"
+ }
+ }
},
- "strategy": {
- "type": "Custom",
- "customStrategy": {
- "from": {
- "kind": "DockerImage",
- "name": "fabric8/openshift-s2i-jenkins-trigger"
- },
- "env": [
- {
- "name": "BASE_URI",
- "value": jenkinsUrl
- },
- {
- "name": "JOB_NAME",
- "value": jobName
- }
- ]
+ "additionalProperties": true,
+ "javaType": "io.fabric8.kubernetes.api.model.Capabilities"
+ },
+ "kubernetes_CephFSVolumeSource": {
+ "type": "object",
+ "description": "",
+ "properties": {
+ "monitors": {
+ "type": "array",
+ "description": "a collection of Ceph monitors",
+ "items": {
+ "type": "string",
+ "description": "a collection of Ceph monitors"
+ }
+ },
+ "readOnly": {
+ "type": "boolean",
+ "description": "Ceph fs to be mounted with read-only permissions"
+ },
+ "secretFile": {
+ "type": "string",
+ "description": "path to secret for rados user; default is /etc/ceph/user.secret; optional"
+ },
+ "secretRef": {
+ "$ref": "#/definitions/kubernetes_LocalObjectReference",
+ "javaType": "io.fabric8.kubernetes.api.model.LocalObjectReference"
+ },
+ "user": {
+ "type": "string",
+ "description": "rados user name; default is admin; optional"
}
- }
- }
- };
- $scope.$watch('entity.spec.source.git.uri', function (val) {
- if (!val) {
- return;
- }
- var lastBit = val.match(/[^\/]+$/)[0];
- if (lastBit) {
- var name = lastBit.replace(/\.git$/, '');
- Kubernetes.log.debug("name: ", name);
- if (!Core.isBlank(name)
- && Core.isBlank(Core.pathGet($scope.entity, ['metadata', 'name']))) {
- Core.pathSet($scope.entity, ['metadata', 'name'], name);
- }
- }
- });
- Kubernetes.initShared($scope, $location, $http, $timeout, $routeParams, KubernetesModel, KubernetesState, KubernetesApiURL);
- $scope.breadcrumbConfig = Developer.createProjectSettingsBreadcrumbs($scope.projectId);
- $scope.subTabConfig = Developer.createProjectSubNavBars($scope.projectId);
- $scope.tabs = Developer.createProjectSettingsSubNavBars($scope.projectId);
- Kubernetes.watch($scope, $element, "secrets", $scope.namespace, onSecrets);
- $scope.buildConfigClient = K8SClientFactory.create("buildconfigs", $scope.namespace);
- $element.on('$destroy', function () {
- $scope.$destroy();
- });
- $scope.$on('$destroy', function () {
- K8SClientFactory.destroy($scope.buildConfigClient);
- });
- /*
- $scope.$on('kubernetesModelUpdated', function () {
- updateData();
- });
-
- */
- $scope.$on('$routeUpdate', function ($event) {
- updateData();
- });
- $scope.save = function () {
- Kubernetes.log.info("Saving!");
- var entity = $scope.entity;
- var spec = (entity || {}).spec || {};
- // TODO update the jenkins job name!
- // lets delete lots of cruft
- var strategy = spec.strategy || {};
- delete strategy["dockerStrategy"];
- delete strategy["sourceStrategy"];
- delete spec["revision"];
- delete spec["output"];
- delete spec["resources"];
- var strategyPullSecretName = Core.pathGet(spec, ["strategy", "customStrategy", "pullSecret", "name"]);
- var sourceSecretName = Core.pathGet(spec, ["source", "sourceSecret", "name"]);
- Kubernetes.log.info("sourceSecretName: " + sourceSecretName);
- Kubernetes.log.info("strategyPullSecretName: " + strategyPullSecretName);
- if (!strategyPullSecretName && sourceSecretName) {
- Core.pathSet(spec, ["strategy", "customStrategy", "pullSecret", "name"], sourceSecretName);
- }
- /*
- // TODO hack until the put deals with updates
- var metadata = entity.metadata;
- if (metadata) {
- delete metadata["resourceVersion"];
- }
- */
- Kubernetes.log.info(angular.toJson(entity, true));
- $scope.buildConfigClient.put(entity, function (obj) {
- Kubernetes.log.info("build config created!");
- var link = Developer.projectSecretsLink($scope.namespace, Kubernetes.getName(entity));
- if (link) {
- Kubernetes.log.info("Navigating to: " + link);
- $location.path(link);
- }
- else {
- Kubernetes.log.warn("Could not find the edit pipeline link!");
- }
- });
- };
- updateData();
- var jenkinsUrl = Developer.jenkinsLink();
- var jobName = "";
- function updateData() {
- $scope.item = null;
- if ($scope.id) {
- var url = Kubernetes.buildConfigRestUrl($scope.id);
- $http.get(url).
- success(function (data, status, headers, config) {
- if (data) {
- $scope.entity = data;
- var buildConfig = angular.copy(data);
- var sortedBuilds = null;
- Kubernetes.enrichBuildConfig(buildConfig, sortedBuilds);
- $scope.buildConfig = buildConfig;
- }
- $scope.spec = ($scope.entity || {}).spec || {};
- $scope.fetched = true;
- // lets update the tabs
- $scope.subTabConfig = Developer.createProjectSubNavBars($scope.projectId, null, $scope);
- Core.$apply($scope);
- }).
- error(function (data, status, headers, config) {
- Kubernetes.log.warn("Failed to load " + url + " " + data + " " + status);
- });
- }
- else {
- $scope.fetched = true;
- $scope.spec = $scope.entity.spec;
- Core.$apply($scope);
- }
- }
- function onSecrets(secrets) {
- var array = [];
- angular.forEach(secrets, function (secret) {
- var name = Kubernetes.getName(secret);
- if (name) {
- array.push({
- label: name,
- value: name,
- "attributes": {
- "title": name
- },
- $secret: secret
- });
- }
- });
- $scope.secrets = _.sortBy(array, "label");
- var specSourceSecretNamePath = ['spec', 'source', 'sourceSecret', 'name'];
- if ($scope.entity && !Core.pathGet($scope.entity, specSourceSecretNamePath)) {
- var defaultSecretName = findDefaultImportSecretName(secrets);
- Core.pathSet($scope.entity, specSourceSecretNamePath, defaultSecretName);
- }
- }
- function findDefaultImportSecretName(secrets) {
- var answer = null;
- angular.forEach(secrets, function (secret) {
- var name = Kubernetes.getName(secret);
- if (!answer && name && name.startsWith("jenkins-login")) {
- answer = name;
- }
- });
- if (!answer) {
- angular.forEach(secrets, function (secret) {
- var name = Kubernetes.getName(secret);
- if (!answer && name && name.startsWith("jenkins-token")) {
- answer = name;
- }
- });
- }
- return answer;
- }
- switch (mode) {
- case 'create':
- delete specConfig.tabs;
- _.forIn(buildSource.properties, function (property, name) {
- if (name !== 'git') {
- Kubernetes.log.info("Hiding property: ", name);
- property.hidden = true;
- }
- });
- _.forIn(gitBuildSource.properties, function (property, name) {
- if (name !== 'uri') {
- Kubernetes.log.info("Hiding property: ", name);
- property.hidden = true;
- }
- else {
- property.label = "Git URL";
- property['input-attributes'] = {
- 'required': true
- };
- }
- });
- _.forIn(specConfig.properties, function (property, name) {
- if (name !== 'source') {
- Kubernetes.log.info("Hiding property: ", name);
- property.hidden = true;
- }
- });
- break;
- case 'edit':
- default:
- }
- $scope.specConfig = specConfig;
- }]);
-})(Kubernetes || (Kubernetes = {}));
-
-///
\n
\n ",
- link: function (scope, element, attrs) {
- if (!initialized) {
- try {
- }
- catch (err) {
- }
- initialized = true;
+ }
+ };
+ return KubernetesModelService;
+ }());
+ Kubernetes.KubernetesModelService = KubernetesModelService;
+ function getTemplateService(model) {
+ var key = createKey('default', 'templates', 'service');
+ var answer = model.servicesByKey[key];
+ Kubernetes.log.debug("found template service: ", answer);
+ return answer;
+ }
+ /**
+ * Creates a model service which keeps track of all the pods, replication controllers and services along
+ * with their associations and status
+ */
+ Kubernetes._module.factory('KubernetesModel', ['$rootScope', '$http', 'KubernetesApiURL', 'KubernetesState', 'WatcherService', '$location', '$resource', function ($rootScope, $http, AppLibraryURL, KubernetesState, watcher, $location, $resource) {
+ var $scope = new KubernetesModelService();
+ $scope.kubernetes = KubernetesState;
+ // create all of our resource classes
+ var typeNames = watcher.getTypes();
+ _.forEach(typeNames, function (type) {
+ var urlTemplate = Kubernetes.uriTemplateForKubernetesKind(type);
+ $scope[type + 'Resource'] = Kubernetes.createResource(type, urlTemplate, $resource, $scope);
+ });
+ if (!Kubernetes.isOpenShift) {
+ // register custom URL factories for templates/projects
+ watcher.registerCustomUrlFunction(KubernetesAPI.WatchTypes.BUILD_CONFIGS, function (options) {
+ var templateService = getTemplateService($scope);
+ if (templateService) {
+ return UrlHelpers.join(templateService.proxyUrl, '/oapi/v1/namespaces/default/buildconfigs/');
}
- scope.HawtioSubTabs = HawtioSubTabs;
- var collapsed = false;
- scope.getClass = function () {
- //log.debug("My class: ", element.attr('class'));
- if (!scope.subTabConfig || !scope.subTabConfig.length) {
- return 'hidden';
- }
- if (collapsed) {
- return 'collapsed';
- }
- return '';
- };
- scope.$on('hawtioCollapseNav', function () {
- collapsed = !collapsed;
- });
- scope.$watch('HawtioSubTabs.get()', function (subTabConfig) {
- scope.subTabConfig = subTabConfig;
- });
- }
- };
+ return null;
+ });
+ // register custom URL factories for templates/projects
+ watcher.registerCustomUrlFunction(KubernetesAPI.WatchTypes.TEMPLATES, function (options) {
+ var templateService = getTemplateService($scope);
+ if (templateService) {
+ return UrlHelpers.join(templateService.proxyUrl, '/oapi/v1/namespaces/default/templates/');
+ }
+ return null;
+ });
+ }
+ // register for all updates on objects
+ watcher.registerListener(function (objects) {
+ var types = watcher.getTypes();
+ _.forEach(types, function (type) {
+ switch (type) {
+ case Kubernetes.WatchTypes.SERVICES:
+ var items = populateKeys(objects[type]);
+ angular.forEach(items, function (item) {
+ item.proxyUrl = Kubernetes.kubernetesProxyUrlForService(Kubernetes.kubernetesApiUrl(), item);
+ });
+ $scope[type] = items;
+ break;
+ case Kubernetes.WatchTypes.TEMPLATES:
+ case Kubernetes.WatchTypes.ROUTES:
+ case Kubernetes.WatchTypes.BUILDS:
+ case Kubernetes.WatchTypes.BUILD_CONFIGS:
+ case Kubernetes.WatchTypes.IMAGE_STREAMS:
+ // don't put a break here :-)
+ default:
+ $scope[type] = populateKeys(objects[type]);
+ }
+ Kubernetes.log.debug("Type: ", type, " object: ", $scope[type]);
+ });
+ $scope.maybeInit();
+ $rootScope.$broadcast('kubernetesModelUpdated', $scope);
+ Core.$apply($rootScope);
+ });
+ // set the selected namespace if set in the location bar
+ // otherwise use whatever previously selected namespace is
+ // available
+ var search = $location.search();
+ if ('namespace' in search) {
+ watcher.setNamespace(search['namespace']);
+ }
+ function selectPods(pods, namespace, labels) {
+ return pods.filter(function (pod) {
+ return Kubernetes.getNamespace(pod) === namespace && Kubernetes.selectorMatches(labels, Kubernetes.getLabels(pod));
+ });
+ }
+ return $scope;
}]);
- Navigation._module.directive('hawtioBreadcrumbsOutlet', ['HawtioBreadcrumbs', 'HawtioSubTabs', function (HawtioBreadcrumbs, HawtioSubTabs) {
- return {
- restrict: 'E',
- scope: {},
- template: "\n \n \n \n ![]()
\n {{subTab.label}}\n \n \n
\n \n \n \n
\n ",
- link: function (scope, element, attrs) {
- scope.breadcrumbs = HawtioBreadcrumbs;
- scope.tabs = HawtioSubTabs;
- scope.$watchCollection('breadcrumbs.get()', function (breadcrumbConfig) {
- scope.breadcrumbConfig = breadcrumbConfig;
- });
- scope.$watchCollection('tabs.get()', function (tabs) {
- var active = _.find(tabs, function (tab) { return tab.active; });
- if (active) {
- scope.pageTitle = active.label;
- }
- else {
- scope.pageTitle = undefined;
- }
- });
- }
+})(Kubernetes || (Kubernetes = {}));
+
+/// \n \n
\n ",
- link: function (scope, element, attrs) {
- if (!initialized) {
- try {
- }
- catch (err) {
- }
- initialized = true;
- }
- scope.HawtioSubTabs = HawtioSubTabs;
- var collapsed = false;
- scope.getClass = function () {
- //log.debug("My class: ", element.attr('class'));
- if (!scope.subTabConfig || !scope.subTabConfig.length) {
- return 'hidden';
+ Kubernetes.initShared($scope, $location, $http, $timeout, $routeParams, KubernetesModel, KubernetesState, KubernetesApiURL);
+ $scope.$on('kubernetesModelUpdated', function () {
+ updateData();
+ });
+ $scope.$on('$routeUpdate', function ($event) {
+ updateData();
+ });
+ $scope.flipRaw = function () {
+ $scope.rawMode = !$scope.rawMode;
+ Core.$apply($scope);
+ };
+ updateData();
+ function updateData() {
+ $scope.id = $routeParams["id"];
+ $scope.item = null;
+ if ($scope.id) {
+ var url = UrlHelpers.join(KubernetesApiURL, "nodes", $scope.id);
+ $http.get(url).
+ success(function (data, status, headers, config) {
+ if (data) {
+ $scope.item = data;
}
- if (collapsed) {
- return 'collapsed';
+ if ($scope.item) {
+ $scope.rawModel = Kubernetes.toRawYaml($scope.item);
}
- return '';
- };
- scope.$on('hawtioCollapseNav', function () {
- collapsed = !collapsed;
- });
- scope.$watch('HawtioSubTabs.get()', function (subTabConfig) {
- scope.subTabConfig = subTabConfig;
+ }).
+ error(function (data, status, headers, config) {
+ Kubernetes.log.warn("Failed to load " + url + " " + data + " " + status);
});
}
- };
+ else {
+ $scope.rawModel = null;
+ Core.$apply($scope);
+ }
+ }
}]);
- //hawtioPluginLoader.addModule('patternfly');
- hawtioPluginLoader.addModule(Navigation.pluginName);
-})(Navigation || (Navigation = {}));
+})(Kubernetes || (Kubernetes = {}));
/// \n
\n ",
+ link: function (scope, element, attr) {
+ var link = scope.$eval('podLink');
+ var name = scope.$eval('containerName');
+ if (!link) {
+ return;
+ }
+ scope.fetched = false;
+ scope.previous = false;
+ scope.messages = [];
+ link = UrlHelpers.join(Kubernetes.masterApiUrl(), link, 'log');
+ link = KubernetesAPI.wsUrl(link);
+ link.search({
+ follow: true,
+ tailLines: 1000,
+ access_token: userDetails.token
+ });
+ var messages = [];
+ var pullMessages = _.debounce(function () {
+ scope.messages = scope.messages.concat(_.remove(messages, function () { return true; }).map(function (msg) {
+ PodLogReplacements.forEach(function (replFunc) {
+ if (angular.isFunction(replFunc)) {
+ msg = replFunc(msg);
+ }
+ });
+ return msg;
+ }));
+ if (!scope.fetched) {
+ scope.fetched = true;
+ }
+ Core.$apply(scope);
+ }, 1000);
+ function initSocket(link) {
+ scope.fetched = false;
+ messages.length = 0;
+ scope.messages.length = 0;
+ var ws = new WebSocket(link.toString(), 'base64.binary.k8s.io');
+ ws.onmessage = function (event) {
+ try {
+ var message = window.atob(event.data);
+ messages.push(message);
+ pullMessages();
+ }
+ catch (err) {
+ }
+ };
+ return ws;
+ }
+ var ws = initSocket(link);
+ scope.$watch('previous', function (value, old) {
+ if (value !== old) {
+ if (link.hasSearch('previous')) {
+ link.removeSearch('previous').addSearch('previous', scope.previous);
+ }
+ else {
+ link.addSearch('previous', scope.previous);
+ }
+ ws.close();
+ ws = initSocket(link);
+ }
+ });
+ element.on('$destroy', function () {
+ if (ws) {
+ try {
+ ws.close();
+ }
+ catch (err) {
+ }
+ delete ws;
+ }
+ });
+ }
+ };
+ }]);
+ Kubernetes._module.directive('podLogWindow', ["$compile", "TerminalService", function ($compile, TerminalService) {
+ return {
+ restrict: 'A',
+ scope: false,
+ link: function (scope, element, attr) {
+ Kubernetes.addWindowActions(scope, element, TerminalService);
+ scope.atBottom = true;
+ scope.$watch('atBottom', function (val) {
+ });
+ }
+ };
+ }]);
+})(Kubernetes || (Kubernetes = {}));
+
+/// Please wait, fetching logs...
\nView previous container logs?
\n \n\n
\n ",
- link: function (scope, element, attr) {
- var link = scope.$eval('podLink');
- var name = scope.$eval('containerName');
- if (!link) {
+ $scope.cancel = function () {
+ if ($scope.formConfig) {
+ delete $scope.formConfig;
+ delete $scope.entity;
+ $scope.objects = undefined;
return;
}
- scope.fetched = false;
- scope.previous = false;
- scope.messages = [];
- link = UrlHelpers.join(Kubernetes.masterApiUrl(), link, 'log');
- link = KubernetesAPI.wsUrl(link);
- link.search({
- follow: true,
- tailLines: 1000,
- access_token: userDetails.token
+ goBack();
+ };
+ /*
+ $scope.$watch('model.templates.length', (newValue) => {
+ if (newValue === 0) {
+ goBack();
+ }
+ });
+ */
+ $scope.filterTemplates = function (template) {
+ if (Core.isBlank($scope.filterText)) {
+ return true;
+ }
+ return _.contains(angular.toJson(template), $scope.filterText.toLowerCase());
+ };
+ $scope.openFullDescription = function (template) {
+ var text = marked(getValueFor(template, 'description') || 'No description');
+ var modal = $modal.open({
+ templateUrl: UrlHelpers.join(Kubernetes.templatePath, 'templateDescription.html'),
+ controller: ['$scope', '$modalInstance', function ($scope, $modalInstance) {
+ $scope.text = text,
+ $scope.ok = function () {
+ modal.close();
+ };
+ }]
});
- var messages = [];
- var pullMessages = _.debounce(function () {
- scope.messages = scope.messages.concat(_.remove(messages, function () { return true; }).map(function (msg) {
- PodLogReplacements.forEach(function (replFunc) {
- if (angular.isFunction(replFunc)) {
- msg = replFunc(msg);
+ };
+ $scope.getDescription = function (template) {
+ var answer = $(marked(getValueFor(template, 'description') || 'No description'));
+ var textDefault = answer.html();
+ var maxLength = 200;
+ if (textDefault.length > maxLength) {
+ var truncated = $.trim(textDefault).substring(0, maxLength).split(' ').slice(0, -1).join(' ');
+ answer.html(truncated + '...');
+ answer.append($templateCache.get('truncatedDescriptionTag.html'));
+ }
+ return answer.html();
+ };
+ $scope.getIconUrl = function (template) {
+ return getValueFor(template, 'iconUrl') || Kubernetes.defaultIconUrl;
+ };
+ $scope.deployTemplate = function (template) {
+ Kubernetes.log.debug("Template parameters: ", template.parameters);
+ Kubernetes.log.debug("Template objects: ", template.objects);
+ Kubernetes.log.debug("Template annotations: ", template.metadata.annotations);
+ var templateAnnotations = template.metadata.annotations;
+ if (templateAnnotations) {
+ _.forEach(template.objects, function (object) {
+ var annotations = object.metadata.annotations || {};
+ var name = Kubernetes.getName(object);
+ var matches = _.filter(_.keys(templateAnnotations), function (key) { return key.match('.' + name + '/'); });
+ matches.forEach(function (match) {
+ if (!(match in annotations)) {
+ annotations[match] = templateAnnotations[match];
}
});
- return msg;
- }));
- if (!scope.fetched) {
- scope.fetched = true;
- }
- Core.$apply(scope);
- }, 1000);
- function initSocket(link) {
- scope.fetched = false;
- messages.length = 0;
- scope.messages.length = 0;
- var ws = new WebSocket(link.toString(), 'base64.binary.k8s.io');
- ws.onmessage = function (event) {
- try {
- var message = window.atob(event.data);
- messages.push(message);
- pullMessages();
+ object.metadata.annotations = annotations;
+ });
+ }
+ var routeServiceName = undefined;
+ var service = _.find(template.objects, function (obj) {
+ if (Kubernetes.getKind(obj) === "Service") {
+ var ports = Kubernetes.getPorts(obj);
+ if (ports && ports.length === 1) {
+ return true;
}
- catch (err) {
+ }
+ else {
+ return false;
+ }
+ });
+ if (service) {
+ routeServiceName = Kubernetes.getName(service);
+ }
+ Kubernetes.log.debug("Service: ", service);
+ if ((!routeServiceName || !Kubernetes.isOpenShift) && (!template.parameters || template.parameters.length === 0)) {
+ Kubernetes.log.debug("No parameters required, deploying objects");
+ applyObjects(template.objects);
+ return;
+ }
+ var formConfig = {
+ style: HawtioForms.FormStyle.STANDARD,
+ hideLegend: true,
+ properties: {}
+ };
+ var params = template.parameters;
+ _.forEach(params, function (param) {
+ var property = {};
+ property.label = _.startCase(param.name);
+ property.description = param.description;
+ property.default = param.value;
+ // TODO, do parameters support types?
+ property.type = 'string';
+ formConfig.properties[param.name] = property;
+ });
+ if (routeServiceName && Kubernetes.isOpenShift) {
+ formConfig.properties.createRoute = {
+ type: 'boolean',
+ default: true,
+ label: "Create Route"
+ };
+ /*
+ formConfig.properties.routeName = {
+ type: 'string',
+ label: 'Route Name',
+ default: routeServiceName,
+ 'control-group-attributes': {
+ 'ng-show': 'entity.createRoute'
+ }
+ };
+ */
+ formConfig.properties.routeServiceName = {
+ type: 'hidden',
+ default: routeServiceName
+ };
+ var namespace = Kubernetes.currentKubernetesNamespace();
+ // TODO store this in localStorage!
+ var domain = "vagrant.f8";
+ var defaultRouteHostSuffix = '.' + (namespace === "default" ? "" : namespace + ".") + domain;
+ formConfig.properties.routeHostname = {
+ type: 'string',
+ default: defaultRouteHostSuffix,
+ label: "Route host name suffix",
+ 'control-group-attributes': {
+ 'ng-show': 'entity.createRoute'
}
};
- return ws;
}
- var ws = initSocket(link);
- scope.$watch('previous', function (value, old) {
- if (value !== old) {
- if (link.hasSearch('previous')) {
- link.removeSearch('previous').addSearch('previous', scope.previous);
- }
- else {
- link.addSearch('previous', scope.previous);
+ $scope.entity = {};
+ $scope.formConfig = formConfig;
+ $scope.objects = template.objects;
+ Kubernetes.log.debug("Form config: ", formConfig);
+ };
+ function substitute(str, data) {
+ return str.replace(/\${\w*}/g, function (match) {
+ var key = match.replace(/\${/, '').replace(/}/, '').trim();
+ return data[key] || match;
+ });
+ }
+ ;
+ $scope.substituteAndDeployTemplate = function () {
+ var objects = $scope.objects;
+ var objectsText = angular.toJson(objects, true);
+ // pull these out of the entity object so they're not used in substitutions
+ var createRoute = $scope.entity.createRoute;
+ var routeHostnameSuffix = $scope.entity.routeHostname || "";
+ var routeName = $scope.entity.routeName;
+ var routeServiceName = $scope.entity.routeServiceName;
+ delete $scope.entity.createRoute;
+ delete $scope.entity.routeHostname;
+ delete $scope.entity.routeName;
+ delete $scope.entity.routeServiceName;
+ objectsText = substitute(objectsText, $scope.entity);
+ objects = angular.fromJson(objectsText);
+ if (createRoute) {
+ var routes = [];
+ angular.forEach(objects, function (object) {
+ var kind = object.kind;
+ var name = Kubernetes.getName(object);
+ if (name && "Service" === kind) {
+ var routeHostname = name + routeHostnameSuffix;
+ var route = {
+ kind: "Route",
+ apiVersion: Kubernetes.defaultOSApiVersion,
+ metadata: {
+ name: name,
+ },
+ spec: {
+ host: routeHostname,
+ to: {
+ kind: "Service",
+ name: name
+ }
+ }
+ };
+ routes.push(route);
+ }
+ });
+ objects = objects.concat(routes);
+ }
+ if ($scope.targetNamespace !== model.currentNamespace()) {
+ $scope.$on('WatcherNamespaceChanged', function () {
+ Kubernetes.log.debug("Namespace changed");
+ setTimeout(function () {
+ applyObjects(objects);
+ Core.$apply($scope);
+ }, 500);
+ });
+ Core.notification('info', "Switching to namespace " + $scope.targetNamespace + " and deploying template");
+ model.kubernetes.selectedNamespace = $scope.targetNamespace;
+ }
+ else {
+ applyObjects(objects);
+ }
+ };
+ function applyObjects(objects) {
+ var projectClient = Kubernetes.createKubernetesClient("projects");
+ _.forEach(objects, function (object) {
+ Kubernetes.log.debug("Object: ", object);
+ var kind = Kubernetes.getKind(object);
+ var name = Kubernetes.getName(object);
+ var ns = Kubernetes.getNamespace(object);
+ if (kind && name) {
+ if (ns && ns !== Kubernetes.currentKubernetesNamespace()) {
+ var project = {
+ apiVersion: Kubernetes.defaultApiVersion,
+ kind: "Project",
+ metadata: {
+ name: ns,
+ labels: {}
+ }
+ };
+ projectClient.put(project, function (data) {
+ Kubernetes.log.info("Created namespace: " + ns);
+ }, function (err) {
+ Kubernetes.log.warn("Failed to create namespace: " + ns + ": " + angular.toJson(err));
+ });
}
- ws.close();
- ws = initSocket(link);
+ var pluralKind = kind.toLowerCase() + "s";
+ var kubeClient = Kubernetes.createKubernetesClient(pluralKind, ns);
+ kubeClient.put(object, function (data) {
+ Kubernetes.log.info("updated " + kind + " name: " + name + (ns ? " ns: " + ns : ""));
+ }, function (err) {
+ Kubernetes.log.warn("Failed to update " + kind + " name: " + name + (ns ? " ns: " + ns : "") + " error: " + angular.toJson(err));
+ });
}
});
- element.on('$destroy', function () {
- if (ws) {
- try {
- ws.close();
- }
- catch (err) {
+ goBack();
+ }
+ $scope.deleteTemplate = function (template) {
+ UI.multiItemConfirmActionDialog({
+ collection: [template],
+ index: 'metadata.name',
+ onClose: function (result) {
+ if (result) {
+ KubernetesModel['templatesResource'].delete({
+ id: template.metadata.name
+ }, undefined, function () {
+ KubernetesModel['templatesResource'].query(function (data) {
+ KubernetesModel.templates = data.items;
+ });
+ }, function (error) {
+ Kubernetes.log.debug("Error deleting template: ", error);
+ });
}
- delete ws;
- }
+ },
+ title: 'Delete Template?',
+ action: 'The following template will be deleted:',
+ okText: 'Delete',
+ okClass: 'btn-danger',
+ custom: "This operation is permanent once completed!",
+ customClass: "alert alert-warning"
+ }).open();
+ };
+ }]);
+})(Kubernetes || (Kubernetes = {}));
+
+/// Please wait, fetching logs...
\nView previous container logs?
\n \n\n = [];
+ function systemModelServices() {
+ this.systemInfoList = [];
+ this.systemInfo = [];
+ this.regionalismInfo = [];
+ this.sqlInfo = [];
+ this.updateCodeInfo();
+ this.updateExcelInfo();
+ this.updateSqlInfo();
+ //this.updateCheckInfo();
+ //console.log(classifyCountry(this.regionalismInfo, '南京市'));
+ }
+ systemModelServices.prototype.updateExcelInfo = function () {
+ var result = [];
+ $.ajax({
+ async: false,
+ type: "POST",
+ url: "/java/console/api/fileOperation/findAll",
+ success: function (data) {
+ if (data)
+ result = data.data;
+ }
});
- updateData();
- function updateData() {
- if ($scope.id) {
- $scope.entity = $scope.model.getReplicationController(KubernetesState.selectedNamespace, $scope.id);
- Core.$apply($scope);
- $scope.fetched = true;
+ this.systemInfoList = result;
+ };
+ systemModelServices.prototype.updateSqlInfo = function () {
+ var result = [];
+ $.ajax({
+ async: false,
+ type: "POST",
+ url: "/java/console/api/filePackage/findAll",
+ success: function (data) {
+ if (data)
+ result = data.data;
}
- else {
- $scope.fetched = true;
+ });
+ this.sqlInfo = result;
+ };
+ systemModelServices.prototype.updateCodeInfo = function () {
+ var result = [];
+ $.ajax({
+ async: false,
+ type: "POST",
+ url: "/java/console/api/code/list",
+ success: function (data) {
+ if (data) {
+ result = data;
+ }
}
- }
+ });
+ this.regionalismInfo = result["regionalism"];
+ this.systemInfo = result["system"];
+ };
+ return systemModelServices;
+ }());
+ System._module.factory('SystemModel', ['$rootScope', '$http', function ($rootScope, $http) {
+ return new systemModelServices();
}]);
-})(Kubernetes || (Kubernetes = {}));
+})(System || (System = {}));
/// = [];
- function systemModelServices() {
- this.systemInfoList = [];
- this.systemInfo = [];
- this.regionalismInfo = [];
- this.sqlInfo = [];
- this.updateCodeInfo();
- this.updateExcelInfo();
- this.updateSqlInfo();
- //this.updateCheckInfo();
- //console.log(classifyCountry(this.regionalismInfo, '南京市'));
- }
- systemModelServices.prototype.updateExcelInfo = function () {
- var result = [];
- $.ajax({
- async: false,
- type: "POST",
- url: "/java/console/api/fileOperation/findAll",
- success: function (data) {
- if (data)
- result = data.data;
- }
- });
- this.systemInfoList = result;
- };
- systemModelServices.prototype.updateSqlInfo = function () {
- var result = [];
- $.ajax({
- async: false,
- type: "POST",
- url: "/java/console/api/filePackage/findAll",
- success: function (data) {
- if (data)
- result = data.data;
- }
- });
- this.sqlInfo = result;
- };
- systemModelServices.prototype.updateCodeInfo = function () {
- var result = [];
- $.ajax({
- async: false,
- type: "POST",
- url: "/java/console/api/code/list",
- success: function (data) {
- if (data) {
- result = data;
+ var endDoubleQuote = text.indexOf('"', endQuote + 1);
+ if (endDoubleQuote <= 0) {
+ break;
+ }
+ var url = text.substring(start, endQuote);
+ // TODO using $compile is a tad complex, for now lets cheat with a little onclick ;)
+ //text = text.substring(0, idx) + " '" + to + "'");
+ var idx = 0;
+ while (true) {
+ idx = text.indexOf(from, idx);
+ if (idx >= 0) {
+ text = text.substring(0, idx) + to + text.substring(idx + from.length);
+ idx += to.length;
+ }
+ else {
+ break;
+ }
+ }
+ }
+ return text;
+ }
+ }]);
+})(Developer || (Developer = {}));
///
\r\n");
$templateCache.put("plugins/developer/html/tools.html","\n
\n ",
+ link: function (scope, element, attrs) {
+ if (!initialized) {
+ try {
}
- }
- ]
- };
- $scope.openLogs = function () {
- var pods = $scope.tableConfig.selectedItems;
- if (!pods || !pods.length) {
- if ($scope.id) {
- var item = $scope.item;
- if (item) {
- pods = [item];
+ catch (err) {
}
+ initialized = true;
}
+ scope.HawtioSubTabs = HawtioSubTabs;
+ var collapsed = false;
+ scope.getClass = function () {
+ //log.debug("My class: ", element.attr('class'));
+ if (!scope.subTabConfig || !scope.subTabConfig.length) {
+ return 'hidden';
+ }
+ if (collapsed) {
+ return 'collapsed';
+ }
+ return '';
+ };
+ scope.$on('hawtioCollapseNav', function () {
+ collapsed = !collapsed;
+ });
+ scope.$watch('HawtioSubTabs.get()', function (subTabConfig) {
+ scope.subTabConfig = subTabConfig;
+ });
}
- Kubernetes.openLogsForPods(ServiceRegistry, $window, KubernetesModel.currentNamespace(), pods);
};
- Kubernetes.initShared($scope, $location, $http, $timeout, $routeParams, KubernetesModel, KubernetesState, KubernetesApiURL);
- $scope.deletePrompt = function (selected) {
- if (angular.isString(selected)) {
- selected = [{
- id: selected
- }];
- }
- UI.multiItemConfirmActionDialog({
- collection: selected,
- index: 'metadata.name',
- onClose: function (result) {
- if (result) {
- function deleteSelected(selected, next) {
- if (next) {
- Kubernetes.log.debug("deleting: ", Kubernetes.getName(next));
- KubernetesPods.delete({
- id: Kubernetes.getName(next)
- }, undefined, function () {
- Kubernetes.log.debug("deleted: ", Kubernetes.getName(next));
- deleteSelected(selected, selected.shift());
- }, function (error) {
- Kubernetes.log.debug("Error deleting: ", error);
- deleteSelected(selected, selected.shift());
- });
- }
- }
- deleteSelected(selected, selected.shift());
+ }]);
+ Navigation._module.directive('hawtioBreadcrumbsOutlet', ['HawtioBreadcrumbs', 'HawtioSubTabs', function (HawtioBreadcrumbs, HawtioSubTabs) {
+ return {
+ restrict: 'E',
+ scope: {},
+ template: "\n \n \n \n ![]()
\n {{subTab.label}}\n \n \n
\n \n \n \n
\n ",
+ link: function (scope, element, attrs) {
+ scope.breadcrumbs = HawtioBreadcrumbs;
+ scope.tabs = HawtioSubTabs;
+ scope.$watchCollection('breadcrumbs.get()', function (breadcrumbConfig) {
+ scope.breadcrumbConfig = breadcrumbConfig;
+ });
+ scope.$watchCollection('tabs.get()', function (tabs) {
+ var active = _.find(tabs, function (tab) { return tab.active; });
+ if (active) {
+ scope.pageTitle = active.label;
}
- },
- title: 'Delete pods?',
- action: 'The following pods will be deleted:',
- okText: 'Delete',
- okClass: 'btn-danger',
- custom: "This operation is permanent once completed!",
- customClass: "alert alert-warning"
- }).open();
+ else {
+ scope.pageTitle = undefined;
+ }
+ });
+ }
};
- $scope.createPods = function () {
- var xhr = new XMLHttpRequest();
- xhr.onreadystatechange = function () {
- if (xhr.readyState == 4) {
- if (xhr.status == 200) {
- var obj = JSON.parse(xhr.responseText);
- var object = {
- "name": "newpod",
- "labels": {
- "aim": "test",
- "app": "oracle"
- },
- "path": '/home/',
- "port": 1525
- };
- Kubernetes.createRC(object);
+ }]);
+ Navigation._module.directive('platformSubTabsOutlet', ['HawtioSubTabs', function (HawtioSubTabs) {
+ var initialized = false;
+ return {
+ restrict: 'AE',
+ replace: true,
+ template: "\n \n \n
\n ",
+ link: function (scope, element, attrs) {
+ if (!initialized) {
+ try {
}
- else {
+ catch (err) {
}
+ initialized = true;
}
- };
- xhr.open("POST", "/oracleAppPath", false); //与服务器连接并发送
- xhr.send(null);
+ scope.HawtioSubTabs = HawtioSubTabs;
+ var collapsed = false;
+ scope.getClass = function () {
+ //log.debug("My class: ", element.attr('class'));
+ if (!scope.subTabConfig || !scope.subTabConfig.length) {
+ return 'hidden';
+ }
+ if (collapsed) {
+ return 'collapsed';
+ }
+ return '';
+ };
+ scope.$on('hawtioCollapseNav', function () {
+ collapsed = !collapsed;
+ });
+ scope.$watch('HawtioSubTabs.get()', function (subTabConfig) {
+ scope.subTabConfig = subTabConfig;
+ });
+ }
};
}]);
-})(Kubernetes || (Kubernetes = {}));
+ //hawtioPluginLoader.addModule('patternfly');
+ hawtioPluginLoader.addModule(Navigation.pluginName);
+})(Navigation || (Navigation = {}));
/// ' + build.displayName + '
' + + 'duration: ' + y + ' seconds
'; + if (date) { + tooltip += 'started: ' + date + '
'; + } + if (result) { + tooltip += 'result: ' + result + '
'; + } + if (x) { + var data = buildsSucceeded; + var key = successBuildKey; + if (!successBuildKey && (!result || !result.startsWith("SUCC"))) { + data = buildsFailed; + key = failedBuildKey; + } + data.push({ + tooltip: tooltip, + color: color, + x: x, y: y }); + } }); - }; - $scope.countrySelect = function (y) { - if (y != 'all') { - $scope.countryFilter = []; - angular.forEach($scope.cityFilter, function (item) { - if (item.districtName == y) - $scope.countryFilter.push(item); + $scope.data = []; + if (buildsSucceeded.length) { + $scope.data.push({ + key: successBuildKey, + values: buildsSucceeded }); } - else - $scope.countryFilter = $scope.cityFilter; - $scope.tableParams.settings({ - dataset: $scope.countryFilter - }); - }; - $scope.statusSelect = function (z) { - var tmp = []; - if ($scope.x == 'all') - tmp = $scope.model; - else - tmp = $scope.countryFilter; - var result = []; - if (z != 'all') { - angular.forEach(tmp, function (item) { - if ($scope.status[item.sysStatus].label == z) - result.push(item); - }); - $scope.tableParams.settings({ - dataset: result + if (buildsFailed.length) { + $scope.data.push({ + key: failedBuildKey, + values: buildsFailed }); } - else { - $scope.tableParams.settings({ - dataset: tmp + $scope.api.updateWithData($scope.data); + $timeout(function () { + $scope.api.update(); + }, 50); + } + function updateData() { + var metricsPath = $scope.jobId ? UrlHelpers.join("job", $scope.jobId, "fabric8/metrics") : "fabric8/metrics"; + var url = Kubernetes.kubernetesProxyUrlForServiceCurrentNamespace(Developer.jenkinsServiceNameAndPort, metricsPath); + Developer.log.info(""); + if (url && (!$scope.jenkins || Kubernetes.keepPollingModel)) { + $http.get(url, Developer.jenkinsHttpConfig). + success(function (data, status, headers, config) { + if (data) { + if (Developer.hasObjectChanged(data, $scope.entityChangedCache)) { + Developer.log.info("entity has changed!"); + $scope.metrics = data; + updateChartData(); + } + } + $scope.model.fetched = true; + Core.$apply($scope); + }). + error(function (data, status, headers, config) { + Developer.log.warn("Failed to load " + url + " " + data + " " + status); }); } - }; - $scope.quickCheck = function () { - updateSqlStatus("/java/console/api/filePackage/totalVerifySqlFile"); - }; - $scope.quitFile = function () { - updateSqlStatus("/java/console/api/filePackage/totalOnholeSqlFile"); - }; - $scope.help = function () { - ngDialog.open({ - template: 'statusHelp.html', - width: 900, - height: 600, - closeByDocument: false, - className: 'ngdialog-theme-default' - }); - }; - // watch for check all checkbox - $scope.$watch(function () { - return $scope.checkboxes.checked; - }, function (value) { - angular.forEach($scope.model, function (item) { - $scope.checkboxes.items[item.id] = value; - }); - }); - // watch for data checkboxes - $scope.$watch(function () { - return $scope.checkboxes.items; - }, function (values) { - $scope.checkable = false; - for (var index in values) { - if (values[index] == true) { - $scope.checkable = true; - break; + } + }]); +})(Developer || (Developer = {})); + +///- \r\n
- \r\n {{item.label}}\r\n \r\n
\r\n
\r\n");
@@ -21340,7 +21341,7 @@ $templateCache.put("plugins/developer/html/projectSelector.html","\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n \r\n
\r\n
\r\n | 已启用 | \r\n已停止 | \r\n\r\n {{volume.name}}\r\n | \r\n\r\n 云路径：{{volume.path}}\r\n | \r\n\r\n \r\n | \r\n\r\n 已用 {{volume.formatUsedSize}} / 共 {{volume.formatTotalSize}}\r\n | \r\n\r\n \r\n \r\n | \r\n
|---|---|---|---|---|---|---|
| \r\n \r\n \r\n | \r\n\r\n 服务器{{$index+1}}\r\n | \r\n\r\n {{row.ip}}\r\n | \r\n\r\n 存储路径:{{row.path}}\r\n | \r\n\r\n 已用 {{row.formatUsedSize}} / 共 {{row.formatAllSize}}\r\n | \r\n\r\n |
\r\n
\r\n\r\n
\r\n \r\n 是否删除：{{showDeleteVolume.item.name}} 云盘?\r\n
\r\n- \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n
\r\n \r\n
\r\n\r\n \r\n \r\n
\r\n \r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n
\r\n \r\n
\r\n There are no projects in this workspace.
\r\n\r\n
\r\n
\r\n \r\n
\r\n");
$templateCache.put("plugins/developer/html/workspace.html","\r\n \r\n
\r\n\r\n \r\n \r\n
\r\n\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n
\r\n \r\n
\r\n There are no tools currently available.
\r\n\r\n
\r\n \r\n
\r\n There are no tools currently available.
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n {{env.label}}\r\n
\r\n \r\n\r\n
\r\n");
-$templateCache.put("plugins/developer/html/workspaces.html","\r\n \r\n
\r\n\r\n \r\n \r\n
\r\n\r\n \r\n \r\n
\r\n \r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n \r\n
\r\n");
+$templateCache.put("plugins/developer/html/workspaces.html","\r\n
\r\n \r\n
\r\n \r\n
\r\n - \r\n
- {{item.label}} \r\n
\r\n
\r\n 当前没有可以查看的数据.
\r\n\r\n
\r\n
\r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
\r\n - \r\n
- 当前显示1~{{model.data.length}}行，共{{model.data.length}}行。 \r\n
- 每页显示\r\n 行\r\n \r\n
- 当前页码 \r\n
- \r\n \r\n \r\n\r\n\r\n \r\n \r\n \r\n \r\n\r\n \r\n
\r\n \r\n
\r\n \r\n\r\n \r\n \r\n
\r\n");
$templateCache.put("plugins/kubernetes/html/appDeployedTemplate.html","\r\n
\r\n \r\n
\r\n \r\n
\r\n - \r\n
- {{item.label}} \r\n
\r\n
\r\n 当前没有可以查看的数据.
\r\n\r\n
\r\n
\r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
\r\n - \r\n
- 当前显示{{(options.currentPageNum-1)*20 + 1}}~{{(options.currentPageNum-1)*20 + model.data.length}}行，共{{model.paramOptions.totalSize}}行, \r\n \r\n
- 当前页码 \r\n
- \r\n \r\n \r\n\r\n\r\n \r\n \r\n \r\n \r\n\r\n \r\n
\r\n \r\n
\r\n \r\n\r\n {{row.entity.$creationDate ? (row.entity.$creationDate | relativeTime) : \'\'}}\r\n
\r\n");
$templateCache.put("plugins/kubernetes/html/appDetailTemplate.html","\r\n
\r\n");
$templateCache.put("plugins/kubernetes/html/appIconTemplate.html","\r\n
\r\n\r\n \r\n \r\n \r\n ![]()
\r\n \r\n \r\n \r\n \r\n {{view.appName}}\r\n \r\n \r\n
\r\n \r\n \r\n \r\n {{view.service.$host}}\r\n \r\n {{view.service.$host}}\r\n \r\n
\r\n \r\n \r\n
\r\n\r\n
\r\n\r\n \r\n
\r\n \r\n deployed:\r\n {{view.createdDate | relativeTime}}\r\n
\r\n \r\n not deployed\r\n
\r\n \r\n
\r\n \r\n pod template:\r\n {{view.controllerId}} \r\n
\r\n \r\n no pod template\r\n
\r\n \r\n \r\n pods:\r\n \r\n {{view.podCount}}\r\n \r\n \r\n {{view.podCount}}\r\n \r\n \r\n
\r\n \r\n
\r\n \r\n
\r\n \r\n \r\n\r\n
\r\n \r\n \r\n
\r\n
\r\n | \r\n \r\n | \r\n\r\n \r\n \r\n \r\n | \r\n\r\n \r\n Pod {{pod.idAbbrev}}\r\n \r\n \r\n IP:\r\n {{pod.status.podIP}}\r\n \r\n | \r\n \r\n \r\n | \r\n
\r\n \r\n ![]()
\r\n \r\n \r\n \r\n {{row.entity.$info.name}}\r\n \r\n \r\n
\r\n");
diff --git a/plugins/developer/html/workspaces.html b/plugins/developer/html/workspaces.html
index f0f397ac..7146d131 100644
--- a/plugins/developer/html/workspaces.html
+++ b/plugins/developer/html/workspaces.html
@@ -35,10 +35,10 @@
-
-
- 当前显示1~{{model.data.length}}行，共{{model.data.length}}行。 -
- 每页显示 +
- 当前显示{{(options.currentPageNum-1)*20 + 1}}~{{(options.currentPageNum-1)*20 + model.data.length}}行，共{{model.paramOptions.totalSize}}行, +
- 当前页码
-
diff --git a/plugins/developer/ts/workspaces.ts b/plugins/developer/ts/workspaces.ts index 27f81459..d31e6a41 100644 --- a/plugins/developer/ts/workspaces.ts +++ b/plugins/developer/ts/workspaces.ts @@ -326,6 +326,7 @@ module Developer { function init($scope,$location,$routeParams){ //$scope.model.updateModel(); $scope.keyQuery = ""; + $scope.model.initParamOptions(); $scope.model.updateParamOption("keyQuery", $scope.keyQuery); if(ConfigsModel.cluster!=null) $scope.volumes = ConfigsModel.cluster;