Merge pull request openshift#2216 from spadgett/quota-undefined-used

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/services/quota.js

@@ -175,17 +175,20 @@ angular.module("openshiftConsole")
         if (resource.kind === 'Pod' && type === 'pods') {
           return;
         }
-        if (!isNil(q.hard[type])) {
-          var quotaReachedAlert = getQuotaResourceReachedAlert(quota, resource, type);
-          if (quotaReachedAlert) {
-            alerts.push(quotaReachedAlert);
-          }
-          else if (type !== 'pods') {
-            // Only calculate this if we havent already reached quota
-            var requestedAlert = getRequestedResourceQuotaAlert(quota, resource, podTemplate, type);
-            if (requestedAlert) {
-              alerts.push(requestedAlert);
-            }
+
+        if (!_.has(q, ['hard', type]) || !_.has(q, ['used', type])) {
+          return;
+        }
+
+        var quotaReachedAlert = getQuotaResourceReachedAlert(quota, resource, type);
+        if (quotaReachedAlert) {
+          alerts.push(quotaReachedAlert);
+        }
+        else if (type !== 'pods') {
+          // Only calculate this if we havent already reached quota
+          var requestedAlert = getRequestedResourceQuotaAlert(quota, resource, podTemplate, type);
+          if (requestedAlert) {
+            alerts.push(requestedAlert);
           }
         }
       });

dist/scripts/scripts.js

@@ -3511,7 +3511,7 @@ target: "_blank"
 var n = [], a = "Pod" === e.kind ? e : _.get(e, "spec.template");
 return a ? (_.each([ "cpu", "memory", "requests.cpu", "requests.memory", "limits.cpu", "limits.memory", "pods" ], function(r) {
 var o = t.status.total || t.status;
-if (("Pod" !== e.kind || "pods" !== r) && !d(o.hard[r])) {
+if (("Pod" !== e.kind || "pods" !== r) && _.has(o, [ "hard", r ]) && _.has(o, [ "used", r ])) {
 var i = S(t, e, r);
 if (i) n.push(i); else if ("pods" !== r) {
 var s = k(t, e, a, r);