bump(github.com/openshift/origin-web-console): d8331ea4e4910a556771ae1e5416e389ab8a3fa5

Author: OpenShift Bot

pkg/assets/bindata.go

@@ -5168,22 +5168,25 @@ target:"_blank"
 _.each(h, p), _.each(i, p);
 }), e) :e;
 }, s = function(a, b) {
-function f() {
-0 === k && (j = r(a, g, h), i.resolve({
-quotaAlerts:j
-}));
-}
-var g, h, i = c.defer(), j = [], k = 2;
-return d.list("resourcequotas", b, function(a) {
-g = a.by("metadata.name"), e.log("quotas", g), k--, f();
-}), d.list("appliedclusterresourcequotas", b, function(a) {
-h = a.by("metadata.name"), e.log("cluster quotas", h), k--, f();
-}), i.promise;
+var f, g, h = [];
+return h.push(d.list("resourcequotas", b).then(function(a) {
+f = a.by("metadata.name"), e.log("quotas", f);
+})), h.push(d.list("appliedclusterresourcequotas", b).then(function(a) {
+g = a.by("metadata.name"), e.log("cluster quotas", g);
+})), c.all(h).then(function() {
+var b = r(a, f, g);
+return {
+quotaAlerts:b
+};
+});
 }, t = function(a, b) {
 var c = function(a) {
 var b = a.status.total || a.status;
 return _.some(b.hard, function(a, c) {
-return "resourcequotas" !== c && (!f(a) && g(a) <= g(b.used[c]));
+if ("resourcequotas" === c) return !1;
+if (a = g(a), !a) return !1;
+var d = g(_.get(b, [ "used", c ]));
+return !!d && a <= d;
 });
 };
 return _.some(a, c) || _.some(b, c);
@@ -6210,25 +6213,30 @@ q.cancel(a);
 });
 });
 }));
-} ]), angular.module("openshiftConsole").controller("QuotaController", [ "$routeParams", "$scope", "DataService", "ProjectsService", "Logger", function(a, b, c, d, e) {
-b.projectName = a.project, b.limitRanges = {}, b.limitsByType = {}, b.labelSuggestions = {}, b.alerts = b.alerts || {}, b.quotaHelp = "Limits resource usage within this project.", b.emptyMessageLimitRanges = "Loading...", b.limitRangeHelp = "Defines minimum and maximum constraints for runtime resources such as memory and CPU.", b.renderOptions = b.renderOptions || {}, b.renderOptions.hideFilterWidget = !0;
-var f = [];
-d.get(a.project).then(_.spread(function(d, g) {
-b.project = d, c.list("resourcequotas", g, function(a) {
-b.quotas = a.by("metadata.name"), e.log("quotas", b.quotas);
-}), c.list("appliedclusterresourcequotas", g, function(c) {
-b.clusterQuotas = c.by("metadata.name"), b.namespaceUsageByClusterQuota = {}, _.each(b.clusterQuotas, function(c, d) {
-if (c.status) {
-var e = _.find(c.status.namespaces, {
-namespace:a.project
-});
-b.namespaceUsageByClusterQuota[d] = e.status;
-}
-}), e.log("cluster quotas", b.clusterQuotas);
-}), c.list("limitranges", g, function(a) {
-b.limitRanges = a.by("metadata.name"), b.emptyMessageLimitRanges = "There are no limit ranges set on this project.", angular.forEach(b.limitRanges, function(a, c) {
-b.limitsByType[c] = {}, angular.forEach(a.spec.limits, function(a) {
-var d = b.limitsByType[c][a.type] = {};
+} ]), angular.module("openshiftConsole").controller("QuotaController", [ "$filter", "$routeParams", "$scope", "DataService", "ProjectsService", "Logger", function(a, b, c, d, e, f) {
+c.projectName = b.project, c.limitRanges = {}, c.limitsByType = {}, c.labelSuggestions = {}, c.alerts = c.alerts || {}, c.quotaHelp = "Limits resource usage within this project.", c.emptyMessageLimitRanges = "Loading...", c.limitRangeHelp = "Defines minimum and maximum constraints for runtime resources such as memory and CPU.", c.renderOptions = c.renderOptions || {}, c.renderOptions.hideFilterWidget = !0;
+var g = [], h = a("usageValue");
+c.isAtLimit = function(a, b) {
+var c = a.status.total || a.status, d = h(_.get(c, [ "hard", b ]));
+if (!d) return !1;
+var e = h(_.get(c, [ "used", b ]));
+return !!e && e >= d;
+}, e.get(b.project).then(_.spread(function(a, e) {
+c.project = a, d.list("resourcequotas", e, function(a) {
+c.quotas = a.by("metadata.name"), f.log("quotas", c.quotas);
+}), d.list("appliedclusterresourcequotas", e, function(a) {
+c.clusterQuotas = a.by("metadata.name"), c.namespaceUsageByClusterQuota = {}, _.each(c.clusterQuotas, function(a, d) {
+if (a.status) {
+var e = _.find(a.status.namespaces, {
+namespace:b.project
+});
+c.namespaceUsageByClusterQuota[d] = e.status;
+}
+}), f.log("cluster quotas", c.clusterQuotas);
+}), d.list("limitranges", e, function(a) {
+c.limitRanges = a.by("metadata.name"), c.emptyMessageLimitRanges = "There are no limit ranges set on this project.", angular.forEach(c.limitRanges, function(a, b) {
+c.limitsByType[b] = {}, angular.forEach(a.spec.limits, function(a) {
+var d = c.limitsByType[b][a.type] = {};
 angular.forEach(a.max, function(a, b) {
 d[b] = d[b] || {}, d[b].max = a;
 }), angular.forEach(a.min, function(a, b) {
@@ -6241,9 +6249,9 @@ d[b] = d[b] || {}, d[b].defaultRequest = a;
 d[b] = d[b] || {}, d[b].maxLimitRequestRatio = a;
 });
 });
-}), e.log("limitRanges", b.limitRanges);
-}), b.$on("$destroy", function() {
-c.unwatchAll(f);
+}), f.log("limitRanges", c.limitRanges);
+}), c.$on("$destroy", function() {
+d.unwatchAll(g);
 });
 }));
 } ]), angular.module("openshiftConsole").controller("MonitoringController", [ "$routeParams", "$location", "$scope", "$filter", "BuildsService", "DataService", "ImageStreamResolver", "KeywordService", "LabelsService", "Logger", "MetricsService", "Navigate", "PodsService", "ProjectsService", "$rootScope", function(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) {
@@ -15137,7 +15145,9 @@ replicationcontrollers:"Replication Controllers",
 "requests.memory":"Memory (Request)",
 resourcequotas:"Resource Quotas",
 secrets:"Secrets",
-services:"Services"
+services:"Services",
+"services.loadbalancers":"Service Load Balancers",
+"services.nodeports":"Service Node Ports"
 }, d = {
 configmaps:"config maps",
 cpu:"CPU (request)",
@@ -15151,7 +15161,9 @@ persistentvolumeclaims:"persistent volume claims",
 replicationcontrollers:"replication controllers",
 "requests.cpu":"CPU (request)",
 "requests.memory":"memory (request)",
-resourcequotas:"resource quotas"
+resourcequotas:"resource quotas",
+"services.loadbalancers":"service load balancers",
+"services.nodeports":"service node ports"
 };
 return b ? c[a] || a :d[a] || a;
 };
@@ -27623,7 +27635,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "<div class=\"table-responsive\">\n" +
     "<table class=\"table\">\n" +
     "<thead>\n" +
-    "<th>Resource type</th>\n" +
+    "<th>Resource Type</th>\n" +
     "<th>Used (this project)</th>\n" +
     "<th>Used (all projects)</th>\n" +
     "<th>Max</th>\n" +
@@ -27637,11 +27649,13 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "</tr>\n" +
     "\n" +
     "<tr ng-repeat=\"(resourceType, specMax) in quota.spec.quota.hard\" ng-if=\"resourceType !== 'resourcequotas'\" ng-class=\"{\n" +
-    "                              warning: (quota.status.total.used[resourceType] | usageValue) >= (quota.status.total.hard[resourceType] | usageValue)\n" +
+    "                              warning: isAtLimit(quota, resourceType),\n" +
+    "                              disabled: (quota.status.total.hard[resourceType] || specMax) === '0'\n" +
     "                            }\">\n" +
     "<td>\n" +
     "{{resourceType | humanizeQuotaResource : true}}\n" +
-    "<span ng-if=\"(quota.status.total.used[resourceType] | usageValue) >= (quota.status.total.hard[resourceType] | usageValue)\" data-toggle=\"tooltip\" title=\"Quota limit reached\" class=\"pficon pficon-warning-triangle-o\" style=\"cursor: help; vertical-align: middle\"></span>\n" +
+    "<span ng-if=\"isAtLimit(quota, resourceType)\" data-toggle=\"tooltip\" title=\"Quota limit reached.\" class=\"pficon pficon-warning-triangle-o warnings-popover\"></span>\n" +
+    "<span ng-if=\"(quota.status.total.hard[resourceType] || specMax) === '0'\" data-toggle=\"tooltip\" title=\"You are not allowed to create resources of this type.\" class=\"pficon pficon-info warnings-popover\"></span>\n" +
     "</td>\n" +
     "<td>\n" +
     "<span ng-if=\"!namespaceUsageByClusterQuota[quota.metadata.name].used\">&mdash;</span>\n" +
@@ -27704,7 +27718,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "<div class=\"table-responsive\">\n" +
     "<table class=\"table\">\n" +
     "<thead>\n" +
-    "<th>Resource type</th>\n" +
+    "<th>Resource Type</th>\n" +
     "<th>Used</th>\n" +
     "<th>Max</th>\n" +
     "</thead>\n" +
@@ -27717,11 +27731,13 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "</tr>\n" +
     "\n" +
     "<tr ng-repeat=\"(resourceType, specMax) in quota.spec.hard\" ng-if=\"resourceType !== 'resourcequotas'\" ng-class=\"{\n" +
-    "                              warning: (quota.status.used[resourceType] | usageValue) >= (quota.status.hard[resourceType] | usageValue)\n" +
+    "                              warning: isAtLimit(quota, resourceType),\n" +
+    "                              disabled: (quota.status.hard[resourceType] || specMax) === '0'\n" +
     "                            }\">\n" +
     "<td>\n" +
     "{{resourceType | humanizeQuotaResource : true}}\n" +
-    "<span ng-if=\"(quota.status.used[resourceType] | usageValue) >= (quota.status.hard[resourceType] | usageValue)\" data-toggle=\"tooltip\" title=\"Quota limit reached\" class=\"pficon pficon-warning-triangle-o\" style=\"cursor: help; vertical-align: middle\"></span>\n" +
+    "<span ng-if=\"isAtLimit(quota, resourceType)\" data-toggle=\"tooltip\" title=\"Quota limit reached.\" class=\"pficon pficon-warning-triangle-o warnings-popover\"></span>\n" +
+    "<span ng-if=\"(quota.status.hard[resourceType] || specMax) === '0'\" data-toggle=\"tooltip\" title=\"You are not allowed to create resources of this type.\" class=\"pficon pficon-info warnings-popover\"></span>\n" +
     "</td>\n" +
     "<td>\n" +
     "<span ng-if=\"!quota.status.used\">&mdash;</span>\n" +
@@ -27748,7 +27764,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "<div class=\"table-responsive\">\n" +
     "<table class=\"table\">\n" +
     "<thead>\n" +
-    "<th>Resource type</th>\n" +
+    "<th>Resource Type</th>\n" +
     "<th>\n" +
     "<span class=\"nowrap\">\n" +
     "Min\n" +
@@ -113372,6 +113388,7 @@ pre.clipped.scroll{max-height:150px;overflow:auto;width:100%}
 .environment-variables.table.table-bordered>tbody>tr>td:last-child .env-var-value a{font-family:"Open Sans",Helvetica,Arial,sans-serif}
 .pretty-json{font-family:Menlo,Monaco,Consolas,monospace;white-space:pre-wrap}
 .info-popover,.warnings-popover{cursor:help;vertical-align:middle;margin-left:2px}
+.info-popover.pficon-info,.warnings-popover.pficon-info{color:#4d5258}
 copy-to-clipboard .input-group.limit-width{max-width:300px}
 .tech-preview-header{justify-content:space-between}
 @media (max-width:479px){.col-xxs-12{width:100%}
@@ -114331,6 +114348,8 @@ td[role=presentation].arrow:after{content:"\2193"}
 .key-value-table>tbody>tr>td.value .truncated-content{white-space:pre}
 .table-word-break-all td{word-break:break-all;word-break:break-word;overflow-wrap:break-word}
 .table-word-break-all td.word-break-normal{word-break:normal;overflow-wrap:normal}
+.table>tbody>tr.disabled>td,.table>tbody>tr.disabled>th,.table>tbody>tr>td.disabled,.table>tbody>tr>th.disabled,.table>tfoot>tr.disabled>td,.table>tfoot>tr.disabled>th,.table>tfoot>tr>td.disabled,.table>tfoot>tr>th.disabled,.table>thead>tr.disabled>td,.table>thead>tr.disabled>th,.table>thead>tr>td.disabled,.table>thead>tr>th.disabled{background-color:#f5f5f5}
+.table-hover>tbody>tr.disabled:hover>td,.table-hover>tbody>tr.disabled:hover>th,.table-hover>tbody>tr:hover>.disabled,.table-hover>tbody>tr>td.disabled:hover,.table-hover>tbody>tr>th.disabled:hover{background-color:#e8e8e8}
 .tile{background:#fff;padding:20px;margin-bottom:20px;word-wrap:break-word;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;overflow-x:hidden}
 .tile h1,.tile h2,.tile h3{margin:10.5px 0px}
 .tile-click{cursor:pointer;position:relative}