manager: add featuregate to remove the restriction of parent quota su…

…bmit pods (#1929) Signed-off-by: xulinfei.xlf <xulinfei.xlf@alibaba-inc.com> Co-authored-by: xulinfei.xlf <xulinfei.xlf@alibaba-inc.com>
koordinator-sh · Mar 12, 2024 · 3bf7ba8 · 3bf7ba8
1 parent c64c01e
commit 3bf7ba8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/pkg/features/features.go b/pkg/features/features.go
@@ -64,6 +64,9 @@ const (
 
 	// DisableDefaultQuota disable default quota.
 	DisableDefaultQuota featuregate.Feature = "DisableDefaultQuota"
+
+	// SupportParentQuotaSubmitPod enables parent Quota submit pod
+	SupportParentQuotaSubmitPod featuregate.Feature = "SupportParentQuotaSubmitPod"
 )
 
 var defaultFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
@@ -80,6 +83,7 @@ var defaultFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
 	ElasticQuotaIgnorePodOverhead:          {Default: false, PreRelease: featuregate.Alpha},
 	ElasticQuotaGuaranteeUsage:             {Default: false, PreRelease: featuregate.Alpha},
 	DisableDefaultQuota:                    {Default: false, PreRelease: featuregate.Alpha},
+	SupportParentQuotaSubmitPod:            {Default: false, PreRelease: featuregate.Alpha},
 }
 
 const (

diff --git a/pkg/features/scheduler_features.go b/pkg/features/scheduler_features.go
@@ -69,6 +69,7 @@ var defaultSchedulerFeatureGates = map[featuregate.Feature]featuregate.FeatureSp
 	ElasticQuotaIgnorePodOverhead:      {Default: false, PreRelease: featuregate.Alpha},
 	ElasticQuotaGuaranteeUsage:         {Default: false, PreRelease: featuregate.Alpha},
 	DisableDefaultQuota:                {Default: false, PreRelease: featuregate.Alpha},
+	SupportParentQuotaSubmitPod:        {Default: false, PreRelease: featuregate.Alpha},
 }
 
 func init() {

diff --git a/pkg/webhook/elasticquota/pod_check.go b/pkg/webhook/elasticquota/pod_check.go
@@ -41,6 +41,11 @@ func (qt *quotaTopology) ValidateAddPod(pod *corev1.Pod) error {
 	qt.lock.Lock()
 	defer qt.lock.Unlock()
 
+	featureGate := utilfeature.DefaultFeatureGate
+	if featureGate.Enabled(features.SupportParentQuotaSubmitPod) {
+		return nil
+	}
+
 	quotaName := qt.getQuotaNameFromPodNoLock(pod)
 	if quotaName == "" || quotaName == extension.DefaultQuotaName {
 		return nil

diff --git a/pkg/webhook/elasticquota/quota_topology_test.go b/pkg/webhook/elasticquota/quota_topology_test.go
@@ -32,9 +32,9 @@ import (
 	"sigs.k8s.io/scheduler-plugins/pkg/apis/scheduling/v1alpha1"
 
 	"github.com/koordinator-sh/koordinator/apis/extension"
-	//"github.com/koordinator-sh/koordinator/pkg/features"
+	koordfeatures "github.com/koordinator-sh/koordinator/pkg/features"
 	utilclient "github.com/koordinator-sh/koordinator/pkg/util/client"
-	//utilfeature "github.com/koordinator-sh/koordinator/pkg/util/feature"
+	utilfeature "github.com/koordinator-sh/koordinator/pkg/util/feature"
 )
 
 func newFakeQuotaTopology() *quotaTopology {
@@ -768,6 +768,11 @@ func TestQuotaTopology_AddPod_UpdatePod(t *testing.T) {
 	err = qt.ValidateUpdatePod(pod2, oldPod2)
 	assert.NotNil(t, err)
 
+	defer utilfeature.SetFeatureGateDuringTest(t, utilfeature.DefaultMutableFeatureGate, koordfeatures.SupportParentQuotaSubmitPod, true)()
+
+	err = qt.ValidateUpdatePod(pod2, oldPod2)
+	assert.Nil(t, err)
+
 	pod2.Labels[extension.LabelQuotaName] = "default"
 	err = qt.ValidateUpdatePod(oldPod2, pod2)
 	assert.Nil(t, err)