github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-17 02:06:23 +00:00
Code Issues Projects Releases Wiki Activity

addressing more reviews

Browse Source
This commit is contained in:
yue9944882
2019-08-07 11:55:15 +08:00
committed by Mike Spreitzer
parent 42f2873e69
commit add890ae27
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/apis/flowcontrol/validation/validation.go
View File

@@ -225,16 +225,16 @@ func ValidatePriorityLevelConfigurationSpec(spec *flowcontrol.PriorityLevelConfi
}
} else {
if spec.AssuredConcurrencyShares != 0 {
allErrs = append(allErrs, field.Invalid(fldPath.Child("assuredConcurrencyShares"), spec.AssuredConcurrencyShares, "must be positive for exempt priority"))
allErrs = append(allErrs, field.Forbidden(fldPath.Child("assuredConcurrencyShares"), "must be zero for exempt priority"))
}
if spec.QueueLengthLimit != 0 {
allErrs = append(allErrs, field.Invalid(fldPath.Child("queueLengthLimit"), spec.QueueLengthLimit, "must be positive for exempt priority"))
allErrs = append(allErrs, field.Forbidden(fldPath.Child("queueLengthLimit"), "must be zero for exempt priority"))
}
if spec.Queues != 0 {
allErrs = append(allErrs, field.Invalid(fldPath.Child("queues"), spec.Queues, "must be positive for exempt priority"))
allErrs = append(allErrs, field.Forbidden(fldPath.Child("queues"), "must be zero for exempt priority"))
}
if spec.HandSize != 0 {
allErrs = append(allErrs, field.Invalid(fldPath.Child("handSize"), spec.HandSize, "must be positive for exempt priority"))
allErrs = append(allErrs, field.Forbidden(fldPath.Child("handSize"), "must be zero for exempt priority"))
}
}
if spec.HandSize > spec.Queues {

1
pkg/master/BUILD
View File

@@ -60,6 +60,7 @@ go_library(
"//pkg/registry/discovery/rest:go_default_library",
"//pkg/registry/events/rest:go_default_library",
"//pkg/registry/extensions/rest:go_default_library",
"//pkg/registry/flowcontrol/rest:go_default_library",
"//pkg/registry/networking/rest:go_default_library",
"//pkg/registry/node/rest:go_default_library",
"//pkg/registry/policy/rest:go_default_library",

2
pkg/master/master.go
View File

@@ -101,6 +101,7 @@ import (
discoveryrest "k8s.io/kubernetes/pkg/registry/discovery/rest"
eventsrest "k8s.io/kubernetes/pkg/registry/events/rest"
extensionsrest "k8s.io/kubernetes/pkg/registry/extensions/rest"
flowcontrolrest "k8s.io/kubernetes/pkg/registry/flowcontrol/rest"
networkingrest "k8s.io/kubernetes/pkg/registry/networking/rest"
noderest "k8s.io/kubernetes/pkg/registry/node/rest"
policyrest "k8s.io/kubernetes/pkg/registry/policy/rest"
@@ -377,6 +378,7 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
coordinationrest.RESTStorageProvider{},
discoveryrest.StorageProvider{},
extensionsrest.RESTStorageProvider{},
flowcontrolrest.RESTStorageProvider{},
networkingrest.RESTStorageProvider{},
noderest.RESTStorageProvider{},
policyrest.RESTStorageProvider{},

8
pkg/registry/flowcontrol/rest/storage_flowcontrol.go
View File

@@ -102,9 +102,9 @@ func (d SystemPresetData) EnsureSystemPresetConfiguration() genericapiserver.Pos
if err != nil && !apierrors.IsAlreadyExists(err) {
return false, err
} else if err == nil {
klog.V(6).Infof("created system preset FlowSchema %s", flowSchema.Name)
klog.V(3).Infof("created system preset FlowSchema %s", flowSchema.Name)
} else {
klog.V(6).Infof("system preset FlowSchema %s already exists, skipping creating", flowSchema.Name)
klog.V(3).Infof("system preset FlowSchema %s already exists, skipping creating", flowSchema.Name)
}
} else {
// Unable to get the priority class for reasons other than "not found".
@@ -121,9 +121,9 @@ func (d SystemPresetData) EnsureSystemPresetConfiguration() genericapiserver.Pos
if err != nil && !apierrors.IsAlreadyExists(err) {
return false, err
} else if err == nil {
klog.V(6).Infof("created system preset PriorityLevelConfiguration %s", priorityLevelConfiguration.Name)
klog.V(3).Infof("created system preset PriorityLevelConfiguration %s", priorityLevelConfiguration.Name)
} else {
klog.V(6).Infof("system preset PriorityLevelConfiguration %s already exists, skipping creating", priorityLevelConfiguration.Name)
klog.V(3).Infof("system preset PriorityLevelConfiguration %s already exists, skipping creating", priorityLevelConfiguration.Name)
}
} else if err == nil {
// Unable to get the priority class for reasons other than "not found".