Skip to content

Bug 1733806: Avoid runtime errors checking quota when processing template #3140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 29, 2019
Merged

Bug 1733806: Avoid runtime errors checking quota when processing template #3140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/scripts/services/quota.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ angular.module("openshiftConsole")
if (resource.kind === 'Pod') {
return filterQuotasForPodTemplate(resource, quotas);
}
else if (_.has(resource, "spec.template")) {
else if (_.has(resource, "spec.template.spec")) {
return filterQuotasForPodTemplate(resource.spec.template, quotas);
}
// We plan on having other resources that scopes will affect
Expand Down Expand Up @@ -156,7 +156,7 @@ angular.module("openshiftConsole")
var getResourceLimitAlerts = function(resource, quota){
var alerts = [];
var podTemplate = resource.kind === "Pod" ? resource : _.get(resource, 'spec.template');
if (!podTemplate) {
if (!podTemplate || !podTemplate.spec) {
// Didn't have a pod template, so we don't care about this resource
return alerts;
}
Expand Down
4 changes: 2 additions & 2 deletions dist/scripts/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3790,7 +3790,7 @@ return !0;
});
});
}, S = function(e, t) {
return e ? "Pod" === e.kind ? b(e, t) : _.has(e, "spec.template") ? b(e.spec.template, t) : t : t;
return e ? "Pod" === e.kind ? b(e, t) : _.has(e, "spec.template.spec") ? b(e.spec.template, t) : t : t;
}, C = e("humanizeQuotaResource"), w = e("humanizeKind"), P = function(e, t, n) {
var r = e.status.total || e.status;
if (f(r.hard[n]) <= f(r.used[n])) {
Expand Down Expand Up @@ -3836,7 +3836,7 @@ target: "_blank"
}
}, I = function(e, t) {
var n = [], r = "Pod" === e.kind ? e : _.get(e, "spec.template");
return r ? (_.each([ "cpu", "memory", "requests.cpu", "requests.memory", "limits.cpu", "limits.memory", "pods" ], function(a) {
return r && r.spec ? (_.each([ "cpu", "memory", "requests.cpu", "requests.memory", "limits.cpu", "limits.memory", "pods" ], function(a) {
var o = t.status.total || t.status;
if (("Pod" !== e.kind || "pods" !== a) && _.has(o, [ "hard", a ]) && _.has(o, [ "used", a ])) {
var i = P(t, e, a);
Expand Down