rancher
/
dashboard
mirror of https://github.com/rancher/dashboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2660 from mantis-toboggan-md/bugfix-create-ns 

Remove default vals for namespace resources
This commit is contained in:
Nancy 2021-04-09 07:02:35 -07:00 committed by GitHub
parent 00453d0fa1 d547bb337c
commit c3be6114a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
components/ContainerResourceLimit.vue
View File

@ -51,27 +51,22 @@ export default {
}; };
const formatted = { const formatted = {
limitsCpu: formatSi(parsed.limitsCpu, { limitsCpu: parsed.limitsCpu ? formatSi(parsed.limitsCpu, {
minExponent: 1, maxExponent: 1, addSuffix: false, increment: 1 / 1000 minExponent: 1, maxExponent: 1, addSuffix: false, increment: 1 / 1000
}), }) : null,
limitsMemory: formatSi(parsed.limitsMemory, { limitsMemory: parsed.limitsMemory ? formatSi(parsed.limitsMemory, {
minExponent: 2, maxExponent: 2, addSuffix: false, increment: 1024, minExponent: 2, maxExponent: 2, addSuffix: false, increment: 1024,
}), }) : null,
requestsCpu: formatSi(parsed.requestsCpu, { requestsCpu: parsed.requestsCpu ? formatSi(parsed.requestsCpu, {
minExponent: 1, maxExponent: 1, addSuffix: false, increment: 1 / 1000, minExponent: 1, maxExponent: 1, addSuffix: false, increment: 1 / 1000,
}), }) : null,
requestsMemory: formatSi(parsed.requestsMemory, { requestsMemory: parsed.requestsMemory ? formatSi(parsed.requestsMemory, {
minExponent: 2, maxExponent: 2, addSuffix: false, increment: 1024, minExponent: 2, maxExponent: 2, addSuffix: false, increment: 1024,
}), }) : null,
viewMode: _VIEW, viewMode: _VIEW,
}; };
return { ...formatted }; return { ...formatted };
// return { ...formatted };
// return {
// limitsCpu, limitsMemory, requestsCpu, requestsMemory
// };
}, },
computed: { computed: {