Skip to content

Commit 1fc020a

Browse files
authored
fix(console): change check GPUManager method (#1597)
1 parent 093dfd7 commit 1fc020a

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

Diff for: web/console/src/modules/cluster/components/resource/resourceEdition/EditResourceContainerItem.tsx

+10-9
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ export class EditResourceContainerItem extends React.Component<ContainerItemProp
4848
{ workloadEdit, addons } = subRoot,
4949
{ containers, canAddContainer, volumes, isCanUseGpu } = workloadEdit;
5050

51-
let container = containers.find(item => item.id === cKey);
51+
const container = containers.find(item => item.id === cKey);
5252
// 选择镜像所需的一些信息
53-
let selectRegistry = {
53+
const selectRegistry = {
5454
id: uuid(),
5555
cKey: cKey
5656
};
@@ -62,13 +62,14 @@ export class EditResourceContainerItem extends React.Component<ContainerItemProp
6262
canAdd = isEmpty(editingContainer) || validateWorkloadActions._canAddContainer(editingContainer, volumes);
6363

6464
// 判断是否能够删除容器
65-
let canDelete = containers.length > 1;
65+
const canDelete = containers.length > 1;
6666

6767
// 判断是否能够使用gpu
68-
let k8sVersion = clusterVersion.split('.');
69-
let isK8sOk = +k8sVersion[0] >= 1 && +k8sVersion[1] >= 8;
70-
let canUseGpu = isK8sOk && isCanUseGpu,
71-
canUseGpuManager = +k8sVersion[0] >= 1 && +k8sVersion[1] >= 10 && addons['GPUManager'] !== undefined;
68+
const hasGPUManager = !!cluster?.selection?.spec?.features?.gpuType;
69+
const k8sVersion = clusterVersion.split('.');
70+
const isK8sOk = +k8sVersion[0] >= 1 && +k8sVersion[1] >= 8;
71+
const canUseGpu = isK8sOk && isCanUseGpu,
72+
canUseGpuManager = +k8sVersion[0] >= 1 && +k8sVersion[1] >= 10 && hasGPUManager;
7273

7374
return (
7475
container && (
@@ -231,11 +232,11 @@ export class EditResourceContainerItem extends React.Component<ContainerItemProp
231232

232233
/** 选择保存按钮 */
233234
private _handleSaveContainer(cKey: string) {
234-
let { actions, subRoot } = this.props,
235+
const { actions, subRoot } = this.props,
235236
{ workloadEdit } = subRoot,
236237
{ containers, volumes } = workloadEdit;
237238

238-
let container = containers.find(c => c.id === cKey);
239+
const container = containers.find(c => c.id === cKey);
239240
// 校验container的所有选项
240241
actions.validate.workload.validateContainer(container);
241242

Diff for: web/console/src/modules/common/models/Cluster.ts

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ interface ClusterSpec {
5858
ipvs: boolean;
5959
public: boolean;
6060
containerRuntime?: ContainerRuntimeEnum;
61+
gpuType?: string;
6162
};
6263

6364
/** 集群类型 */

0 commit comments

Comments
 (0)