globalDefault |
-globalDefault specifies whether this PriorityClass should be considered as the default priority for pods that do not have any priority class. |
+globalDefault specifies whether this PriorityClass should be considered as the default priority for pods that do not have any priority class. Only one PriorityClass can be marked as globalDefault. However, if more than one PriorityClasses exists with their globalDefault field set to true, the smallest value of such global default PriorityClasses will be used as the default priority. |
false |
boolean |
false |
diff --git a/pkg/apis/scheduling/types.go b/pkg/apis/scheduling/types.go
index 5130d624a03..d5db894a8d0 100644
--- a/pkg/apis/scheduling/types.go
+++ b/pkg/apis/scheduling/types.go
@@ -44,8 +44,11 @@ type PriorityClass struct {
// receive when they have the name of this class in their pod spec.
Value int32
- // GlobalDefault specifies whether this PriorityClass should be considered as
+ // globalDefault specifies whether this PriorityClass should be considered as
// the default priority for pods that do not have any priority class.
+ // Only one PriorityClass can be marked as `globalDefault`. However, if more than
+ // one PriorityClasses exists with their `globalDefault` field set to true,
+ // the smallest value of such global default PriorityClasses will be used as the default priority.
// +optional
GlobalDefault bool
diff --git a/plugin/pkg/admission/priority/admission.go b/plugin/pkg/admission/priority/admission.go
index 5a0c98d278c..3750ec86aff 100644
--- a/plugin/pkg/admission/priority/admission.go
+++ b/plugin/pkg/admission/priority/admission.go
@@ -231,12 +231,17 @@ func (p *PriorityPlugin) getDefaultPriorityClass() (*scheduling.PriorityClass, e
if err != nil {
return nil, err
}
+ // In case more than one global default priority class is added as a result of a race condition,
+ // we pick the one with the lowest priority value.
+ var defaultPC *scheduling.PriorityClass
for _, pci := range list {
if pci.GlobalDefault {
- return pci, nil
+ if defaultPC == nil || defaultPC.Value > pci.Value {
+ defaultPC = pci
+ }
}
}
- return nil, nil
+ return defaultPC, nil
}
func (p *PriorityPlugin) getDefaultPriority() (int32, error) {
diff --git a/plugin/pkg/admission/priority/admission_test.go b/plugin/pkg/admission/priority/admission_test.go
index c9122ac63f0..06963588c61 100644
--- a/plugin/pkg/admission/priority/admission_test.go
+++ b/plugin/pkg/admission/priority/admission_test.go
@@ -189,6 +189,14 @@ func TestDefaultPriority(t *testing.T) {
expectedDefaultBefore: scheduling.DefaultPriorityWhenNoDefaultClassExists,
expectedDefaultAfter: defaultClass1.Value,
},
+ {
+ name: "multiple default classes resolves to the minimum value among them",
+ classesBefore: []*scheduling.PriorityClass{defaultClass1, defaultClass2},
+ classesAfter: []*scheduling.PriorityClass{defaultClass2},
+ attributes: admission.NewAttributesRecord(nil, nil, pcKind, "", defaultClass1.Name, pcResource, "", admission.Delete, nil),
+ expectedDefaultBefore: defaultClass1.Value,
+ expectedDefaultAfter: defaultClass2.Value,
+ },
{
name: "delete default priority class",
classesBefore: []*scheduling.PriorityClass{defaultClass1},
diff --git a/staging/src/k8s.io/api/scheduling/v1alpha1/generated.proto b/staging/src/k8s.io/api/scheduling/v1alpha1/generated.proto
index 588ef9718b0..e964a76dd4d 100644
--- a/staging/src/k8s.io/api/scheduling/v1alpha1/generated.proto
+++ b/staging/src/k8s.io/api/scheduling/v1alpha1/generated.proto
@@ -43,6 +43,9 @@ message PriorityClass {
// globalDefault specifies whether this PriorityClass should be considered as
// the default priority for pods that do not have any priority class.
+ // Only one PriorityClass can be marked as `globalDefault`. However, if more than
+ // one PriorityClasses exists with their `globalDefault` field set to true,
+ // the smallest value of such global default PriorityClasses will be used as the default priority.
// +optional
optional bool globalDefault = 3;
diff --git a/staging/src/k8s.io/api/scheduling/v1alpha1/types.go b/staging/src/k8s.io/api/scheduling/v1alpha1/types.go
index 07bf337fb14..21e3df0af96 100644
--- a/staging/src/k8s.io/api/scheduling/v1alpha1/types.go
+++ b/staging/src/k8s.io/api/scheduling/v1alpha1/types.go
@@ -39,6 +39,9 @@ type PriorityClass struct {
// globalDefault specifies whether this PriorityClass should be considered as
// the default priority for pods that do not have any priority class.
+ // Only one PriorityClass can be marked as `globalDefault`. However, if more than
+ // one PriorityClasses exists with their `globalDefault` field set to true,
+ // the smallest value of such global default PriorityClasses will be used as the default priority.
// +optional
GlobalDefault bool `json:"globalDefault,omitempty" protobuf:"bytes,3,opt,name=globalDefault"`
diff --git a/staging/src/k8s.io/api/scheduling/v1alpha1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/scheduling/v1alpha1/types_swagger_doc_generated.go
index 4b68bf04a47..9080dd9d68c 100644
--- a/staging/src/k8s.io/api/scheduling/v1alpha1/types_swagger_doc_generated.go
+++ b/staging/src/k8s.io/api/scheduling/v1alpha1/types_swagger_doc_generated.go
@@ -31,7 +31,7 @@ var map_PriorityClass = map[string]string{
"": "PriorityClass defines mapping from a priority class name to the priority integer value. The value can be any valid integer.",
"metadata": "Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata",
"value": "The value of this priority class. This is the actual priority that pods receive when they have the name of this class in their pod spec.",
- "globalDefault": "globalDefault specifies whether this PriorityClass should be considered as the default priority for pods that do not have any priority class.",
+ "globalDefault": "globalDefault specifies whether this PriorityClass should be considered as the default priority for pods that do not have any priority class. Only one PriorityClass can be marked as `globalDefault`. However, if more than one PriorityClasses exists with their `globalDefault` field set to true, the smallest value of such global default PriorityClasses will be used as the default priority.",
"description": "description is an arbitrary string that usually provides guidelines on when this priority class should be used.",
}