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

fix agent config cpu req unit formatting (#5022)

This commit is contained in:
Nancy 2023-05-15 16:07:49 -07:00 committed by GitHub
parent e488323476
commit 6f465e3543
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/shared/addon/components/form-agent-config/template.hbs
View File

@ -62,7 +62,7 @@
{{#if (and (or (not useDefaultAffinity) (not editing) ) overrideAffinity) }} {{#if (and (or (not useDefaultAffinity) (not editing) ) overrideAffinity) }}
<BannerMessage <BannerMessage
@color="bg-warning mb-10" @color="bg-warning mb-10"
@message={{t "clusterNew.agentConfig.banners.affinity"}} @message={{t "clusterNew.agentConfig.banners.affinity" htmlSafe=true}}
/> />
<FormAffinityK8s <FormAffinityK8s
@editing={{editing}} @editing={{editing}}

8
lib/shared/addon/components/resource-list/component.js
View File

@ -6,6 +6,7 @@ import {
get, get,
} from '@ember/object'; } from '@ember/object';
import { parseSi } from '../../utils/parse-unit'; import { parseSi } from '../../utils/parse-unit';
import { convertToMillis } from '../../utils/util';
export default Component.extend({ export default Component.extend({
layout, layout,
@ -51,12 +52,7 @@ export default Component.extend({
get(){ get(){
let cpu = get(this.value, 'cpu') let cpu = get(this.value, 'cpu')
if (!!cpu){ return cpu ? convertToMillis(cpu.toString()) : null
// parse si returns cpu in CPUs - multiply by 1000 to get mCPUs
cpu = parseSi(cpu) * 1000
}
return cpu
}, },
set(key, val){ set(key, val){
const out = { ...this.value } const out = { ...this.value }