diff --git a/dist/origin-web-common-ui.js b/dist/origin-web-common-ui.js index 8cfc943..bd9c911 100644 --- a/dist/origin-web-common-ui.js +++ b/dist/origin-web-common-ui.js @@ -1330,7 +1330,9 @@ angular.module('openshiftCommonUI') "loggingDataPrefix": ["openshift.io/logging.data.prefix"], "idledAt": ["idling.alpha.openshift.io/idled-at"], "idledPreviousScale": ["idling.alpha.openshift.io/previous-scale"], - "systemOnly": ["authorization.openshift.io/system-only"] + "systemOnly": ["authorization.openshift.io/system-only"], + "hpaConditions": ["autoscaling.alpha.kubernetes.io/conditions"], + "hpaMetrics": ["autoscaling.alpha.kubernetes.io/metrics"] }; return function(annotationKey) { return annotationMap[annotationKey] || null; @@ -1386,11 +1388,21 @@ angular.module('openshiftCommonUI') }; }) .filter('imageStreamTagIconClass', function(imageStreamTagAnnotationFilter) { - return function(resource, /* optional */ tagName) { - var icon = imageStreamTagAnnotationFilter(resource, "iconClass", tagName); - return (icon) ? icon : "fa fa-cube"; - }; -}); + return function(resource, /* optional */ tagName) { + var icon = imageStreamTagAnnotationFilter(resource, "iconClass", tagName); + return (icon) ? icon : "fa fa-cube"; + }; + }) + .filter('hpaConditions', function(annotationFilter) { + return function(hpa) { + return JSON.parse(annotationFilter(hpa, 'hpaConditions')); + }; + }) + .filter('hpaMetrics', function(annotationFilter) { + return function(hpa) { + return JSON.parse(annotationFilter(hpa, 'hpaMetrics')); + }; + }); ;'use strict'; angular diff --git a/dist/origin-web-common.js b/dist/origin-web-common.js index 94ff5db..750c33b 100644 --- a/dist/origin-web-common.js +++ b/dist/origin-web-common.js @@ -1537,7 +1537,9 @@ angular.module('openshiftCommonUI') "loggingDataPrefix": ["openshift.io/logging.data.prefix"], "idledAt": ["idling.alpha.openshift.io/idled-at"], "idledPreviousScale": ["idling.alpha.openshift.io/previous-scale"], - "systemOnly": ["authorization.openshift.io/system-only"] + "systemOnly": ["authorization.openshift.io/system-only"], + "hpaConditions": ["autoscaling.alpha.kubernetes.io/conditions"], + "hpaMetrics": ["autoscaling.alpha.kubernetes.io/metrics"] }; return function(annotationKey) { return annotationMap[annotationKey] || null; @@ -1593,11 +1595,21 @@ angular.module('openshiftCommonUI') }; }]) .filter('imageStreamTagIconClass', ["imageStreamTagAnnotationFilter", function(imageStreamTagAnnotationFilter) { - return function(resource, /* optional */ tagName) { - var icon = imageStreamTagAnnotationFilter(resource, "iconClass", tagName); - return (icon) ? icon : "fa fa-cube"; - }; -}]); + return function(resource, /* optional */ tagName) { + var icon = imageStreamTagAnnotationFilter(resource, "iconClass", tagName); + return (icon) ? icon : "fa fa-cube"; + }; + }]) + .filter('hpaConditions', ["annotationFilter", function(annotationFilter) { + return function(hpa) { + return JSON.parse(annotationFilter(hpa, 'hpaConditions')); + }; + }]) + .filter('hpaMetrics', ["annotationFilter", function(annotationFilter) { + return function(hpa) { + return JSON.parse(annotationFilter(hpa, 'hpaMetrics')); + }; + }]); ;'use strict'; angular diff --git a/dist/origin-web-common.min.js b/dist/origin-web-common.min.js index 15ee0da..abc580d 100644 --- a/dist/origin-web-common.min.js +++ b/dist/origin-web-common.min.js @@ -749,7 +749,9 @@ loggingUIHostname:[ "openshift.io/logging.ui.hostname" ], loggingDataPrefix:[ "openshift.io/logging.data.prefix" ], idledAt:[ "idling.alpha.openshift.io/idled-at" ], idledPreviousScale:[ "idling.alpha.openshift.io/previous-scale" ], -systemOnly:[ "authorization.openshift.io/system-only" ] +systemOnly:[ "authorization.openshift.io/system-only" ], +hpaConditions:[ "autoscaling.alpha.kubernetes.io/conditions" ], +hpaMetrics:[ "autoscaling.alpha.kubernetes.io/metrics" ] }; return function(annotationKey) { return annotationMap[annotationKey] || null; @@ -784,6 +786,14 @@ return function(resource, tagName) { var icon = imageStreamTagAnnotationFilter(resource, "iconClass", tagName); return icon ? icon :"fa fa-cube"; }; +} ]).filter("hpaConditions", [ "annotationFilter", function(annotationFilter) { +return function(hpa) { +return JSON.parse(annotationFilter(hpa, "hpaConditions")); +}; +} ]).filter("hpaMetrics", [ "annotationFilter", function(annotationFilter) { +return function(hpa) { +return JSON.parse(annotationFilter(hpa, "hpaMetrics")); +}; } ]), angular.module("openshiftCommonUI").filter("canI", [ "AuthorizationService", function(AuthorizationService) { return function(resource, verb, projectName) { return AuthorizationService.canI(resource, verb, projectName); diff --git a/src/filters/annotation.js b/src/filters/annotation.js index 2cb86b5..20cd2fc 100644 --- a/src/filters/annotation.js +++ b/src/filters/annotation.js @@ -28,7 +28,9 @@ angular.module('openshiftCommonUI') "loggingDataPrefix": ["openshift.io/logging.data.prefix"], "idledAt": ["idling.alpha.openshift.io/idled-at"], "idledPreviousScale": ["idling.alpha.openshift.io/previous-scale"], - "systemOnly": ["authorization.openshift.io/system-only"] + "systemOnly": ["authorization.openshift.io/system-only"], + "hpaConditions": ["autoscaling.alpha.kubernetes.io/conditions"], + "hpaMetrics": ["autoscaling.alpha.kubernetes.io/metrics"] }; return function(annotationKey) { return annotationMap[annotationKey] || null; @@ -84,8 +86,18 @@ angular.module('openshiftCommonUI') }; }) .filter('imageStreamTagIconClass', function(imageStreamTagAnnotationFilter) { - return function(resource, /* optional */ tagName) { - var icon = imageStreamTagAnnotationFilter(resource, "iconClass", tagName); - return (icon) ? icon : "fa fa-cube"; - }; -}); + return function(resource, /* optional */ tagName) { + var icon = imageStreamTagAnnotationFilter(resource, "iconClass", tagName); + return (icon) ? icon : "fa fa-cube"; + }; + }) + .filter('hpaConditions', function(annotationFilter) { + return function(hpa) { + return JSON.parse(annotationFilter(hpa, 'hpaConditions')); + }; + }) + .filter('hpaMetrics', function(annotationFilter) { + return function(hpa) { + return JSON.parse(annotationFilter(hpa, 'hpaMetrics')); + }; + });