scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-10-31 10:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
tanshanshan
2017-02-03 10:01:03 +08:00
parent 3ce49346a7
commit 6fd76dc139
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.linted_packages
View File

@@ -257,6 +257,7 @@ plugin/pkg/admission/securitycontext/scdeny
plugin/pkg/auth plugin/pkg/auth
plugin/pkg/auth/authorizer plugin/pkg/auth/authorizer
plugin/pkg/auth/authorizer/rbac/bootstrappolicy plugin/pkg/auth/authorizer/rbac/bootstrappolicy
plugin/pkg/scheduler/api/validation
staging/src/k8s.io/apimachinery/pkg/api/equality staging/src/k8s.io/apimachinery/pkg/api/equality
staging/src/k8s.io/apimachinery/pkg/api/errors staging/src/k8s.io/apimachinery/pkg/api/errors
staging/src/k8s.io/apimachinery/pkg/api/resource staging/src/k8s.io/apimachinery/pkg/api/resource

4
plugin/pkg/scheduler/api/validation/validation.go
View File

@@ -23,10 +23,10 @@ import (
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
) )
// Validate checks for errors in the Config // ValidatePolicy checks for errors in the Config
// It does not return early so that it can find as many errors as possible // It does not return early so that it can find as many errors as possible
func ValidatePolicy(policy schedulerapi.Policy) error { func ValidatePolicy(policy schedulerapi.Policy) error {
validationErrors := make([]error, 0) var validationErrors []error
for _, priority := range policy.Priorities { for _, priority := range policy.Priorities {
if priority.Weight <= 0 { if priority.Weight <= 0 {

15
plugin/pkg/scheduler/api/validation/validation_test.go
View File

@@ -50,3 +50,18 @@ func TestValidatePriorityWithNegativeWeight(t *testing.T) {
t.Errorf("Expected error about priority weight not being positive") t.Errorf("Expected error about priority weight not being positive")
} }
} }
func TestValidateExtenderWithNonNegativeWeight(t *testing.T) {
extenderPolicy := api.Policy{ExtenderConfigs: []api.ExtenderConfig{{URLPrefix: "http://127.0.0.1:8081/extender", FilterVerb: "filter", Weight: 2}}}
errs := ValidatePolicy(extenderPolicy)
if errs != nil {
t.Errorf("Unexpected errors %v", errs)
}
}
func TestValidateExtenderWithNegativeWeight(t *testing.T) {
extenderPolicy := api.Policy{ExtenderConfigs: []api.ExtenderConfig{{URLPrefix: "http://127.0.0.1:8081/extender", FilterVerb: "filter", Weight: -2}}}
if ValidatePolicy(extenderPolicy) == nil {
t.Errorf("Expected error about priority weight for extender not being positive")
}
}