github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #66540 from hanxiaoshuai/fixut0724 

Automatic merge from submit-queue (batch tested with PRs 66540, 66599). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

replace predicates string with corresponding const in TestDefaultPredicates

**What this PR does / why we need it**:
replace predicates string with corresponding const in TestDefaultPredicates. Unify with the const in func defaultPredicates().
**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
pull/8/head
Kubernetes Submit Queue 2018-07-26 01:55:14 -07:00 committed by GitHub
parent d9f02d90be 2c59a683a2
commit 84a15d0291
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/scheduler/algorithmprovider/defaults/defaults_test.go
View File

@ -67,18 +67,18 @@ func TestDefaultPriorities(t *testing.T) {
func TestDefaultPredicates(t *testing.T) { func TestDefaultPredicates(t *testing.T) {
result := sets.NewString( result := sets.NewString(
"NoVolumeZoneConflict", predicates.NoVolumeZoneConflictPred,
"MaxEBSVolumeCount", predicates.MaxEBSVolumeCountPred,
"MaxGCEPDVolumeCount", predicates.MaxGCEPDVolumeCountPred,
"MaxAzureDiskVolumeCount", predicates.MaxAzureDiskVolumeCountPred,
"MatchInterPodAffinity", predicates.MatchInterPodAffinityPred,
"NoDiskConflict", predicates.NoDiskConflictPred,
"GeneralPredicates", predicates.GeneralPred,
"CheckNodeMemoryPressure", predicates.CheckNodeMemoryPressurePred,
"CheckNodeDiskPressure", predicates.CheckNodeDiskPressurePred,
"CheckNodePIDPressure", predicates.CheckNodePIDPressurePred,
"CheckNodeCondition", predicates.CheckNodeConditionPred,
"PodToleratesNodeTaints", predicates.PodToleratesNodeTaintsPred,
predicates.CheckVolumeBindingPred, predicates.CheckVolumeBindingPred,
) )