move targetCPUPercentile into a flag

vertical-pod-autoscaler/pkg/recommender/input/cluster_feeder.go

@@ -58,7 +58,8 @@ const (
  scaleCacheEntryFreshnessTime time.Duration = 10 * time.Minute
  scaleCacheEntryJitterFactor float64 = 1.
  defaultResyncPeriod time.Duration = 10 * time.Minute
- defaultRecommenderName = "default"
+ // DefaultRecommenderName denotes the current recommender name as the "default" one.
+ DefaultRecommenderName = "default"
 )
 
 // ClusterStateFeeder can update state of ClusterState object.
@@ -94,6 +95,7 @@ type ClusterStateFeederFactory struct {
  SelectorFetcher target.VpaTargetSelectorFetcher
  MemorySaveMode bool
  ControllerFetcher controllerfetcher.ControllerFetcher
+ RecommenderName string
 }
 
 // Make creates new ClusterStateFeeder with internal data providers, based on kube client.
@@ -109,12 +111,13 @@ func (m ClusterStateFeederFactory) Make() *clusterStateFeeder {
  selectorFetcher: m.SelectorFetcher,
  memorySaveMode: m.MemorySaveMode,
  controllerFetcher: m.ControllerFetcher,
+ recommenderName: m.RecommenderName,
  }
 }
 
 // NewClusterStateFeeder creates new ClusterStateFeeder with internal data providers, based on kube client config.
 // Deprecated; Use ClusterStateFeederFactory instead.
-func NewClusterStateFeeder(config *rest.Config, clusterState *model.ClusterState, memorySave bool, namespace string) ClusterStateFeeder {
+func NewClusterStateFeeder(config *rest.Config, clusterState *model.ClusterState, memorySave bool, namespace string, recommenderName string) ClusterStateFeeder {
  kubeClient := kube_client.NewForConfigOrDie(config)
  podLister, oomObserver := NewPodListerAndOOMObserver(kubeClient, namespace)
  factory := informers.NewSharedInformerFactoryWithOptions(kubeClient, defaultResyncPeriod, informers.WithNamespace(namespace))
@@ -131,6 +134,7 @@ func NewClusterStateFeeder(config *rest.Config, clusterState *model.ClusterState
  SelectorFetcher: target.NewVpaTargetSelectorFetcher(config, kubeClient, factory),
  MemorySaveMode: memorySave,
  ControllerFetcher: controllerFetcher,
+ RecommenderName: recommenderName,
  }.Make()
 }
 
@@ -224,6 +228,7 @@ type clusterStateFeeder struct {
  selectorFetcher target.VpaTargetSelectorFetcher
  memorySaveMode bool
  controllerFetcher controllerfetcher.ControllerFetcher
+ recommenderName string
 }
 
 func (feeder *clusterStateFeeder) InitFromHistoryProvider(historyProvider history.HistoryProvider) {
@@ -349,10 +354,16 @@ func filterVPAs(feeder *clusterStateFeeder, allVpaCRDs []*vpa_types.VerticalPodA
  klog.V(3).Infof("Start selecting the vpaCRDs.")
  var vpaCRDs []*vpa_types.VerticalPodAutoscaler
  for _, vpaCRD := range allVpaCRDs {
- currentRecommenderName := defaultRecommenderName
- if !implicitDefaultRecommender(vpaCRD.Spec.Recommenders) && !selectsRecommender(vpaCRD.Spec.Recommenders, &currentRecommenderName) {
- klog.V(6).Infof("Ignoring vpaCRD %s in namespace %s as current recommender's name %v doesn't appear among its recommenders", vpaCRD.Name, vpaCRD.Namespace, currentRecommenderName)
- continue
+ if feeder.recommenderName == DefaultRecommenderName {
+ if !implicitDefaultRecommender(vpaCRD.Spec.Recommenders) && !selectsRecommender(vpaCRD.Spec.Recommenders, &feeder.recommenderName) {
+ klog.V(6).Infof("Ignoring vpaCRD %s in namespace %s as current recommender's name %v doesn't appear among its recommenders", vpaCRD.Name, vpaCRD.Namespace, feeder.recommenderName)
+ continue
+ }
+ } else {
+ if implicitDefaultRecommender(vpaCRD.Spec.Recommenders) {
+ klog.V(6).Infof("Ignoring vpaCRD %s in namespace %s as %v recommender doesn't process CRDs implicitly destined to %v recommender", vpaCRD.Name, vpaCRD.Namespace, feeder.recommenderName, DefaultRecommenderName)
+ continue
+ }
  }
  vpaCRDs = append(vpaCRDs, vpaCRD)
  }

vertical-pod-autoscaler/pkg/recommender/input/cluster_feeder_test.go

@@ -216,6 +216,7 @@ func TestLoadPods(t *testing.T) {
  key: tc.topMostWellKnownOrScalableKey,
  err: tc.findTopMostWellKnownOrScalableError,
  },
+ recommenderName: DefaultRecommenderName,
  }
 
  targetSelectorFetcher.EXPECT().Fetch(vpa).Return(tc.selector, tc.fetchSelectorError)

vertical-pod-autoscaler/pkg/recommender/logic/recommender.go

@@ -26,6 +26,7 @@ var (
  safetyMarginFraction = flag.Float64("recommendation-margin-fraction", 0.15, `Fraction of usage added as the safety margin to the recommended request`)
  podMinCPUMillicores = flag.Float64("pod-recommendation-min-cpu-millicores", 25, `Minimum CPU recommendation for a pod`)
  podMinMemoryMb = flag.Float64("pod-recommendation-min-memory-mb", 250, `Minimum memory recommendation for a pod`)
+ targetCPUPercentile = flag.Float64("target-cpu-percentile", 0.9, "Target CPU percentile to consider when computing recommendations")
 )
 
 // PodResourceRecommender computes resource recommendation for a Vpa object.
@@ -99,15 +100,14 @@ func FilterControlledResources(estimation model.Resources, controlledResources [
 
 // CreatePodResourceRecommender returns the primary recommender.
 func CreatePodResourceRecommender() PodResourceRecommender {
- targetCPUPercentile := 0.9
  lowerBoundCPUPercentile := 0.5
  upperBoundCPUPercentile := 0.95
 
  targetMemoryPeaksPercentile := 0.9
  lowerBoundMemoryPeaksPercentile := 0.5
  upperBoundMemoryPeaksPercentile := 0.95
 
- targetEstimator := NewPercentileEstimator(targetCPUPercentile, targetMemoryPeaksPercentile)
+ targetEstimator := NewPercentileEstimator(*targetCPUPercentile, targetMemoryPeaksPercentile)
  lowerBoundEstimator := NewPercentileEstimator(lowerBoundCPUPercentile, lowerBoundMemoryPeaksPercentile)
  upperBoundEstimator := NewPercentileEstimator(upperBoundCPUPercentile, upperBoundMemoryPeaksPercentile)
 

vertical-pod-autoscaler/pkg/recommender/main.go

@@ -18,6 +18,7 @@ package main
 
 import (
  "flag"
+ "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/recommender/input"
  "time"
 
  apiv1 "k8s.io/api/core/v1"
@@ -32,10 +33,8 @@ import (
  "k8s.io/klog/v2"
 )
 
-// DefaultRecommenderName denotes the current recommender name as the "default" one.
-const DefaultRecommenderName = "default"
-
 var (
+ recommenderName = flag.String("name", input.DefaultRecommenderName, "Set the recommender name for CRD filtering")
  metricsFetcherInterval = flag.Duration("recommender-interval", 1*time.Minute, `How often metrics should be fetched`)
  checkpointsGCInterval = flag.Duration("checkpoints-gc-interval", 10*time.Minute, `How often orphaned checkpoints should be garbage collected`)
  prometheusAddress = flag.String("prometheus-address", "", `Where to reach for Prometheus metrics`)
@@ -71,7 +70,7 @@ var (
 func main() {
  klog.InitFlags(nil)
  kube_flag.InitFlags()
- klog.V(1).Infof("Vertical Pod Autoscaler %s Recommender: %v", common.VerticalPodAutoscalerVersion, DefaultRecommenderName)
+ klog.V(1).Infof("Vertical Pod Autoscaler %s Recommender: %v", common.VerticalPodAutoscalerVersion, recommenderName)
 
  config := common.CreateKubeConfigOrDie(*kubeconfig, float32(*kubeApiQps), int(*kubeApiBurst))
 
@@ -83,7 +82,7 @@ func main() {
  metrics_quality.Register()
 
  useCheckpoints := *storage != "prometheus"
- recommender := routines.NewRecommender(config, *checkpointsGCInterval, useCheckpoints, *vpaObjectNamespace)
+ recommender := routines.NewRecommender(config, *checkpointsGCInterval, useCheckpoints, *vpaObjectNamespace, *recommenderName)
 
  promQueryTimeout, err := time.ParseDuration(*queryTimeout)
  if err != nil {

vertical-pod-autoscaler/pkg/recommender/routines/recommender.go

@@ -242,14 +242,14 @@ func (c RecommenderFactory) Make() Recommender {
 // NewRecommender creates a new recommender instance.
 // Dependencies are created automatically.
 // Deprecated; use RecommenderFactory instead.
-func NewRecommender(config *rest.Config, checkpointsGCInterval time.Duration, useCheckpoints bool, namespace string) Recommender {
+func NewRecommender(config *rest.Config, checkpointsGCInterval time.Duration, useCheckpoints bool, namespace string, recommenderName string) Recommender {
  clusterState := model.NewClusterState(AggregateContainerStateGCInterval)
  kubeClient := kube_client.NewForConfigOrDie(config)
  factory := informers.NewSharedInformerFactoryWithOptions(kubeClient, defaultResyncPeriod, informers.WithNamespace(namespace))
  controllerFetcher := controllerfetcher.NewControllerFetcher(config, kubeClient, factory, scaleCacheEntryFreshnessTime, scaleCacheEntryLifetime, scaleCacheEntryJitterFactor)
  return RecommenderFactory{
  ClusterState: clusterState,
- ClusterStateFeeder: input.NewClusterStateFeeder(config, clusterState, *memorySaver, namespace),
+ ClusterStateFeeder: input.NewClusterStateFeeder(config, clusterState, *memorySaver, namespace, recommenderName),
  ControllerFetcher: controllerFetcher,
  CheckpointWriter: checkpoint.NewCheckpointWriter(clusterState, vpa_clientset.NewForConfigOrDie(config).AutoscalingV1()),
  VpaClient: vpa_clientset.NewForConfigOrDie(config).AutoscalingV1(),