From 79325e06ed39a11a24abccad959fe8a9574180d4 Mon Sep 17 00:00:00 2001 From: "Bobby (Babak) Salamat" Date: Fri, 2 Feb 2018 15:07:20 -0800 Subject: [PATCH] Remove validation failure of Pod priority when the feauter is disabled --- pkg/apis/core/validation/validation.go | 8 +----- pkg/apis/core/validation/validation_test.go | 28 --------------------- 2 files changed, 1 insertion(+), 35 deletions(-) diff --git a/pkg/apis/core/validation/validation.go b/pkg/apis/core/validation/validation.go index e7d2c5af788b..30875c22a1ff 100644 --- a/pkg/apis/core/validation/validation.go +++ b/pkg/apis/core/validation/validation.go @@ -2883,19 +2883,13 @@ func ValidatePodSpec(spec *core.PodSpec, fldPath *field.Path) field.ErrorList { } if len(spec.PriorityClassName) > 0 { - if !utilfeature.DefaultFeatureGate.Enabled(features.PodPriority) { - allErrs = append(allErrs, field.Forbidden(fldPath.Child("priorityClassName"), "Pod priority is disabled by feature-gate")) - } else { + if utilfeature.DefaultFeatureGate.Enabled(features.PodPriority) { for _, msg := range ValidatePriorityClassName(spec.PriorityClassName, false) { allErrs = append(allErrs, field.Invalid(fldPath.Child("priorityClassName"), spec.PriorityClassName, msg)) } } } - if spec.Priority != nil && !utilfeature.DefaultFeatureGate.Enabled(features.PodPriority) { - allErrs = append(allErrs, field.Forbidden(fldPath.Child("priority"), "Pod priority is disabled by feature-gate")) - } - return allErrs } diff --git a/pkg/apis/core/validation/validation_test.go b/pkg/apis/core/validation/validation_test.go index ae28b107344e..d9b85dbfe63c 100644 --- a/pkg/apis/core/validation/validation_test.go +++ b/pkg/apis/core/validation/validation_test.go @@ -5823,34 +5823,6 @@ func TestValidatePodSpec(t *testing.T) { t.Errorf("expected failure for %q", k) } } - - err = utilfeature.DefaultFeatureGate.Set("PodPriority=false") - if err != nil { - t.Errorf("Failed to disable feature gate for PodPriority: %v", err) - return - } - priority := int32(100) - featuregatedCases := map[string]core.PodSpec{ - "set PriorityClassName": { - Volumes: []core.Volume{{Name: "vol", VolumeSource: core.VolumeSource{EmptyDir: &core.EmptyDirVolumeSource{}}}}, - Containers: []core.Container{{Name: "ctr", Image: "image", ImagePullPolicy: "IfNotPresent", TerminationMessagePolicy: "File"}}, - RestartPolicy: core.RestartPolicyAlways, - DNSPolicy: core.DNSClusterFirst, - PriorityClassName: "valid-name", - }, - "set Priority": { - Volumes: []core.Volume{{Name: "vol", VolumeSource: core.VolumeSource{EmptyDir: &core.EmptyDirVolumeSource{}}}}, - Containers: []core.Container{{Name: "ctr", Image: "image", ImagePullPolicy: "IfNotPresent", TerminationMessagePolicy: "File"}}, - RestartPolicy: core.RestartPolicyAlways, - DNSPolicy: core.DNSClusterFirst, - Priority: &priority, - }, - } - for k, v := range featuregatedCases { - if errs := ValidatePodSpec(&v, field.NewPath("field")); len(errs) == 0 { - t.Errorf("expected failure due to gated feature: %q", k) - } - } } func extendPodSpecwithTolerations(in core.PodSpec, tolerations []core.Toleration) core.PodSpec {