Revert "QoS Manager Framework (#590)"

This reverts commit 0de7d7b.

Signed-off-by: Jason Liu <jasonliu747@gmail.com>

cmd/koordlet/main.go

@@ -68,12 +68,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	// Init config from ConfigMap.
-	if err = cfg.InitFromConfigMap(); err != nil {
-		klog.Error("Unable to init config from ConfigMap: ", err)
-		os.Exit(1)
-	}
-
 	d, err := agent.NewDaemon(cfg)
 	if err != nil {
 		klog.Error("Unable to setup koordlet daemon: ", err)

pkg/features/koordlet_features.go

@@ -17,12 +17,8 @@ limitations under the License.
 package features
 
 import (
-	"fmt"
-
 	"k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/component-base/featuregate"
-
-	slov1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1"
 )
 
 const (
@@ -79,21 +75,3 @@ var (
 		Accelerators:           {Default: false, PreRelease: featuregate.Alpha},
 	}
 )
-
-// IsFeatureDisabled returns whether the featuregate is disabled by nodeSLO config
-func IsFeatureDisabled(nodeSLO *slov1alpha1.NodeSLO, feature featuregate.Feature) (bool, error) {
-	if nodeSLO == nil || nodeSLO.Spec == (slov1alpha1.NodeSLOSpec{}) {
-		return true, fmt.Errorf("cannot parse feature config for invalid nodeSLO %v", nodeSLO)
-	}
-
-	spec := nodeSLO.Spec
-	switch feature {
-	case BECPUSuppress, BEMemoryEvict, BECPUEvict:
-		if spec.ResourceUsedThresholdWithBE == nil || spec.ResourceUsedThresholdWithBE.Enable == nil {
-			return true, fmt.Errorf("cannot parse feature config for invalid nodeSLO %v", nodeSLO)
-		}
-		return !(*spec.ResourceUsedThresholdWithBE.Enable), nil
-	default:
-		return true, fmt.Errorf("cannot parse feature config for unsupported feature %s", feature)
-	}
-}

pkg/koordlet/config/config.go

@@ -17,14 +17,9 @@ limitations under the License.
 package config
 
 import (
-	"context"
-	"encoding/json"
-	"errors"
 	"flag"
 	"strings"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	cliflag "k8s.io/component-base/cli/flag"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
@@ -33,61 +28,44 @@ import (
 	"github.com/koordinator-sh/koordinator/pkg/koordlet/audit"
 	"github.com/koordinator-sh/koordinator/pkg/koordlet/metriccache"
 	"github.com/koordinator-sh/koordinator/pkg/koordlet/metricsadvisor"
-	qosmanagerconfig "github.com/koordinator-sh/koordinator/pkg/koordlet/qosmanager/config"
 	"github.com/koordinator-sh/koordinator/pkg/koordlet/reporter"
 	"github.com/koordinator-sh/koordinator/pkg/koordlet/resmanager"
 	"github.com/koordinator-sh/koordinator/pkg/koordlet/runtimehooks"
 	"github.com/koordinator-sh/koordinator/pkg/koordlet/statesinformer"
 	"github.com/koordinator-sh/koordinator/pkg/util/system"
 )
 
-const (
-	DefaultKoordletConfigMapNamespace = "koordinator-system"
-	DefaultKoordletConfigMapName      = "koordlet-config"
-
-	CMKeyQoSPluginExtraConfigs = "qos-plugin-extra-configs"
-)
-
 type Configuration struct {
-	ConfigMapName      string
-	ConfigMapNamesapce string
 	KubeRestConf       *rest.Config
 	StatesInformerConf *statesinformer.Config
 	ReporterConf       *reporter.Config
 	CollectorConf      *metricsadvisor.Config
 	MetricCacheConf    *metriccache.Config
 	ResManagerConf     *resmanager.Config
-	QosManagerConf     *qosmanagerconfig.Config
 	RuntimeHookConf    *runtimehooks.Config
 	AuditConf          *audit.Config
 	FeatureGates       map[string]bool
 }
 
 func NewConfiguration() *Configuration {
 	return &Configuration{
-		ConfigMapName:      DefaultKoordletConfigMapName,
-		ConfigMapNamesapce: DefaultKoordletConfigMapNamespace,
 		StatesInformerConf: statesinformer.NewDefaultConfig(),
 		ReporterConf:       reporter.NewDefaultConfig(),
 		CollectorConf:      metricsadvisor.NewDefaultConfig(),
 		MetricCacheConf:    metriccache.NewDefaultConfig(),
 		ResManagerConf:     resmanager.NewDefaultConfig(),
-		QosManagerConf:     qosmanagerconfig.NewDefaultConfig(),
 		RuntimeHookConf:    runtimehooks.NewDefaultConfig(),
 		AuditConf:          audit.NewDefaultConfig(),
 	}
 }
 
 func (c *Configuration) InitFlags(fs *flag.FlagSet) {
-	fs.StringVar(&c.ConfigMapName, "configmap-name", DefaultKoordletConfigMapName, "determines the name the koordlet configmap uses.")
-	fs.StringVar(&c.ConfigMapNamesapce, "configmap-namespace", DefaultKoordletConfigMapNamespace, "determines the namespace of configmap uses.")
 	system.Conf.InitFlags(fs)
 	c.StatesInformerConf.InitFlags(fs)
 	c.ReporterConf.InitFlags(fs)
 	c.CollectorConf.InitFlags(fs)
 	c.MetricCacheConf.InitFlags(fs)
 	c.ResManagerConf.InitFlags(fs)
-	c.QosManagerConf.InitFlags(fs)
 	c.RuntimeHookConf.InitFlags(fs)
 	c.AuditConf.InitFlags(fs)
 	fs.Var(cliflag.NewMapStringBool(&c.FeatureGates), "feature-gates", "A set of key=value pairs that describe feature gates for alpha/experimental features. "+
@@ -103,28 +81,3 @@ func (c *Configuration) InitClient() error {
 	c.KubeRestConf = cfg
 	return nil
 }
-
-func (c *Configuration) InitFromConfigMap() error {
-	if c.KubeRestConf == nil {
-		return errors.New("KubeRestConf is nil")
-	}
-	cli, err := kubernetes.NewForConfig(c.KubeRestConf)
-	if err != nil {
-		return err
-	}
-	cm, err := cli.CoreV1().ConfigMaps(c.ConfigMapNamesapce).Get(context.TODO(), c.ConfigMapName, metav1.GetOptions{})
-	if err != nil {
-		return err
-	}
-
-	// Setup extra configs for QoS Manager.
-	if qosPluginExtraConfigRaw, found := cm.Data[CMKeyQoSPluginExtraConfigs]; found {
-		var extraConfigs map[string]string
-		if err = json.Unmarshal([]byte(qosPluginExtraConfigRaw), &extraConfigs); err != nil {
-			return err
-		}
-		c.QosManagerConf.PluginExtraConfigs = extraConfigs
-	}
-
-	return nil
-}