Skip to content

Commit

Permalink
[PH-38] Instance types setting cannot be saved properly (#499)
Browse files Browse the repository at this point in the history
Signed-off-by: raymond nguyen <[email protected]>
  • Loading branch information
ducnbh authored Feb 23, 2024
1 parent 21c52f3 commit 87cb0a2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
7 changes: 3 additions & 4 deletions packages/client/src/admin/InstanceTypes/InstanceTypeForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -232,10 +232,9 @@ export function _InstanceTypeForm({

React.useEffect(() => {
if (data) {
if (data?.tolerations.length > 0) {
const tolerations = data.tolerations.map(t => omit(t, ['__typename']));
setTolerations(tolerations);
}

const tolerations = data.tolerations.map(t => omit(t, ['__typename']));
setTolerations(tolerations);

if (data?.groups.length > 0) {
dispatchUserGroups({ type: 'GROUPS', groups: data.groups });
Expand Down
3 changes: 2 additions & 1 deletion packages/graphql-server/src/resolvers/instanceType.ts
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ export const updateMapping = (data: any) => {
expectInputLargerThanZero(data.memoryLimit, 'memoryLimit');

const tolerations = validateAndMapTolerations(get(data, 'tolerations.set'), 'update');
const nodeSelector = (data.nodeSelector && isEmpty(data.nodeSelector)) ? null : data.nodeSelector;

return {
metadata: {
Expand All @@ -192,7 +193,7 @@ export const updateMapping = (data: any) => {
'limits.nvidia.com/gpu': data.gpuLimit,
'requests.cpu': data.cpuRequest,
'requests.memory': parseRequestField(data.memoryRequest, stringifyMemory),
'nodeSelector': data.nodeSelector,
'nodeSelector': nodeSelector,
tolerations,
}
};
Expand Down

0 comments on commit 87cb0a2

Please sign in to comment.