Skip to content

Commit 6aca355

Browse files
FouoFFouoF
committed
add quota_test
Signed-off-by: Jifei Wang <[email protected]>
1 parent e9c1615 commit 6aca355

File tree

16 files changed

+268
-28
lines changed

16 files changed

+268
-28
lines changed

‎charts/hami/templates/scheduler/clusterrole.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,7 @@ rules:
1818
- apiGroups: [""]
1919
resources: ["events"]
2020
verbs: ["create", "get", "list"]
21+
- apiGroups: [""]
22+
resources: ["resourcequotas"]
23+
verbs: ["get", "list", "watch"]
2124

‎pkg/device/ascend/device.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,8 @@ func (dev *Devices) AddResourceUsage(pod *corev1.Pod, n *device.DeviceUsage, ctr
289289
return nil
290290
}
291291

292-
func (dev *Devices) GetResourceNames() device.ResoureNames {
293-
return device.ResoureNames{
292+
func (dev *Devices) GetResourceNames() device.ResourceNames {
293+
return device.ResourceNames{
294294
ResourceCountName: dev.config.ResourceName,
295295
ResourceMemoryName: dev.config.ResourceMemoryName,
296296
ResourceCoreName: "",

‎pkg/device/awsneuron/device.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ func (dev *AWSNeuronDevices) CheckHealth(devType string, n *corev1.Node) (bool,
211211
return true, true
212212
}
213213

214-
func (dev *AWSNeuronDevices) GetResourceNames() device.ResoureNames {
215-
return device.ResoureNames{
214+
func (dev *AWSNeuronDevices) GetResourceNames() device.ResourceNames {
215+
return device.ResourceNames{
216216
ResourceCountName: dev.resourceCountName,
217217
ResourceMemoryName: "",
218218
ResourceCoreName: dev.resourceCoreName,

‎pkg/device/cambricon/device.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,8 +422,8 @@ func (cam *CambriconDevices) Fit(devices []*device.DeviceUsage, request device.C
422422
return false, tmpDevs, common.GenReason(reason, len(devices))
423423
}
424424

425-
func (dev *CambriconDevices) GetResourceNames() device.ResoureNames {
426-
return device.ResoureNames{
425+
func (dev *CambriconDevices) GetResourceNames() device.ResourceNames {
426+
return device.ResourceNames{
427427
ResourceCountName: MLUResourceCount,
428428
ResourceMemoryName: MLUResourceMemory,
429429
ResourceCoreName: MLUResourceCores,

‎pkg/device/devices.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ type Devices interface {
3535
MutateAdmission(ctr *corev1.Container, pod *corev1.Pod) (bool, error)
3636
CheckHealth(devType string, n *corev1.Node) (bool, bool)
3737
NodeCleanUp(nn string) error
38-
GetResourceNames() ResoureNames
38+
GetResourceNames() ResourceNames
3939
GetNodeDevices(n corev1.Node) ([]*DeviceInfo, error)
4040
LockNode(n *corev1.Node, p *corev1.Pod) error
4141
ReleaseNodeLock(n *corev1.Node, p *corev1.Pod) error
@@ -118,7 +118,7 @@ type NodeInfo struct {
118118
Devices []DeviceInfo
119119
}
120120

121-
type ResoureNames struct {
121+
type ResourceNames struct {
122122
ResourceCountName string
123123
ResourceMemoryName string
124124
ResourceCoreName string

‎pkg/device/enflame/device.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,8 @@ func (enf *EnflameDevices) Fit(devices []*device.DeviceUsage, request device.Con
328328
return false, tmpDevs, common.GenReason(reason, len(devices))
329329
}
330330

331-
func (dev *EnflameDevices) GetResourceNames() device.ResoureNames {
332-
return device.ResoureNames{
331+
func (dev *EnflameDevices) GetResourceNames() device.ResourceNames {
332+
return device.ResourceNames{
333333
ResourceCountName: EnflameResourceNameVGCU,
334334
ResourceMemoryName: EnflameResourceNameVGCUPercentage,
335335
ResourceCoreName: "",

‎pkg/device/enflame/gcu.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ func (gcuDev *GCUDevices) Fit(devices []*device.DeviceUsage, request device.Cont
182182
return false, tmpDevs, common.GenReason(reason, len(devices))
183183
}
184184

185-
func (dev *GCUDevices) GetResourceNames() device.ResoureNames {
186-
return device.ResoureNames{
185+
func (dev *GCUDevices) GetResourceNames() device.ResourceNames {
186+
return device.ResourceNames{
187187
ResourceCountName: EnflameResourceNameGCU,
188188
ResourceMemoryName: "",
189189
ResourceCoreName: "",

‎pkg/device/hygon/device.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,8 +374,8 @@ func (dcu *DCUDevices) Fit(devices []*device.DeviceUsage, request device.Contain
374374
return false, tmpDevs, common.GenReason(reason, len(devices))
375375
}
376376

377-
func (dev *DCUDevices) GetResourceNames() device.ResoureNames {
378-
return device.ResoureNames{
377+
func (dev *DCUDevices) GetResourceNames() device.ResourceNames {
378+
return device.ResourceNames{
379379
ResourceCountName: HygonResourceCount,
380380
ResourceMemoryName: HygonResourceMemory,
381381
ResourceCoreName: HygonResourceCores,

‎pkg/device/iluvatar/device.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,8 @@ func (ilu *IluvatarDevices) Fit(devices []*device.DeviceUsage, request device.Co
333333
return false, tmpDevs, common.GenReason(reason, len(devices))
334334
}
335335

336-
func (dev *IluvatarDevices) GetResourceNames() device.ResoureNames {
337-
return device.ResoureNames{
336+
func (dev *IluvatarDevices) GetResourceNames() device.ResourceNames {
337+
return device.ResourceNames{
338338
ResourceCountName: IluvatarResourceCount,
339339
ResourceMemoryName: IluvatarResourceMemory,
340340
ResourceCoreName: IluvatarResourceCores,

‎pkg/device/kunlun/device.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@ func (kl *KunlunDevices) Fit(devices []*device.DeviceUsage, request device.Conta
224224
return true, tmpDevs, ""
225225
}
226226

227-
func (dev *KunlunDevices) GetResourceNames() device.ResoureNames {
228-
return device.ResoureNames{
227+
func (dev *KunlunDevices) GetResourceNames() device.ResourceNames {
228+
return device.ResourceNames{
229229
ResourceCountName: KunlunResourceCount,
230230
ResourceMemoryName: "",
231231
ResourceCoreName: "",

0 commit comments

Comments
 (0)