gocrane · qmhu · Oct 31, 2022 · Oct 31, 2022
diff --git a/examples/analytics/recommendation-configuration.yaml b/examples/analytics/recommendation-configuration.yaml
@@ -17,3 +17,9 @@ recommenders:
     acceptedResources:
       - kind: Node
         apiVersion: v1
+  - name: HPA
+    acceptedResources:
+      - kind: Deployment
+        apiVersion: apps/v1
+      - kind: StatefulSet
+        apiVersion: apps/v1
diff --git a/pkg/recommendation/framework/context.go b/pkg/recommendation/framework/context.go
@@ -17,6 +17,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/gocrane/api/analysis/v1alpha1"
+	autoscalingapi "github.com/gocrane/api/autoscaling/v1alpha1"
 
 	"github.com/gocrane/crane/pkg/common"
 	"github.com/gocrane/crane/pkg/metricnaming"
@@ -64,6 +65,8 @@ type RecommendationContext struct {
 	Pods []corev1.Pod
 	// HPA Object
 	HPA *autoscalingv2.HorizontalPodAutoscaler
+	// HPA Object
+	EHPA *autoscalingapi.EffectiveHorizontalPodAutoscaler
 }
 
 func NewRecommendationContext(context context.Context, identity ObjectIdentity, predictorMgr predictormgr.Manager, dataProviders map[providers.DataSourceType]providers.History, recommendation *v1alpha1.Recommendation, client client.Client, scaleClient scale.ScalesGetter) RecommendationContext {

diff --git a/pkg/recommendation/recommender/hpa/filter.go b/pkg/recommendation/recommender/hpa/filter.go
@@ -6,6 +6,8 @@ import (
 	autoscalingv2 "k8s.io/api/autoscaling/v2beta2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	autoscalingapi "github.com/gocrane/api/autoscaling/v1alpha1"
+
 	"github.com/gocrane/crane/pkg/known"
 	"github.com/gocrane/crane/pkg/recommendation/framework"
 )
@@ -32,9 +34,28 @@ func (rr *HPARecommender) Filter(ctx *framework.RecommendationContext) error {
 		}
 
 		if hpa.Spec.ScaleTargetRef.Name == ctx.Recommendation.Spec.TargetRef.Name &&
-			hpa.Spec.ScaleTargetRef.Kind == ctx.Recommendation.Spec.TargetRef.APIVersion &&
+			hpa.Spec.ScaleTargetRef.Kind == ctx.Recommendation.Spec.TargetRef.Kind &&
 			hpa.Spec.ScaleTargetRef.APIVersion == ctx.Recommendation.Spec.TargetRef.APIVersion {
 			ctx.HPA = &hpa
+			break
+		}
+	}
+
+	ehpaList := &autoscalingapi.EffectiveHorizontalPodAutoscalerList{}
+	opts = []client.ListOption{
+		client.InNamespace(ctx.Recommendation.Spec.TargetRef.Namespace),
+	}
+	err = ctx.Client.List(context.TODO(), ehpaList, opts...)
+	if err != nil {
+		return err
+	}
+
+	for _, ehpa := range ehpaList.Items {
+		if ehpa.Spec.ScaleTargetRef.Name == ctx.Recommendation.Spec.TargetRef.Name &&
+			ehpa.Spec.ScaleTargetRef.Kind == ctx.Recommendation.Spec.TargetRef.Kind &&
+			ehpa.Spec.ScaleTargetRef.APIVersion == ctx.Recommendation.Spec.TargetRef.APIVersion {
+			ctx.EHPA = &ehpa
+			break
 		}
 	}
 

diff --git a/pkg/recommendation/recommender/hpa/recommend.go b/pkg/recommendation/recommender/hpa/recommend.go
@@ -1,6 +1,7 @@
 package hpa
 
 import (
+	"encoding/json"
 	"fmt"
 	"math"
 	"strconv"
@@ -9,6 +10,7 @@ import (
 	"github.com/montanaflynn/stats"
 	autoscalingv2 "k8s.io/api/autoscaling/v2beta2"
 	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/yaml"
 
@@ -57,10 +59,12 @@ func (rr *HPARecommender) Policy(ctx *framework.RecommendationContext) error {
 		}
 	}
 
-	for _, sample := range ctx.ResultValues[0].Samples {
-		cpuUsages = append(cpuUsages, sample.Value)
-		if sample.Value > cpuMax {
-			cpuMax = sample.Value
+	if len(ctx.ResultValues) >= 1 {
+		for _, sample := range ctx.ResultValues[0].Samples {
+			cpuUsages = append(cpuUsages, sample.Value)
+			if sample.Value > cpuMax {
+				cpuMax = sample.Value
+			}
 		}
 	}
 
@@ -157,7 +161,61 @@ func (rr *HPARecommender) Policy(ctx *framework.RecommendationContext) error {
 	}
 
 	ctx.Recommendation.Status.RecommendedValue = string(resultBytes)
-	// TODO: Implement recommend info
+	if ctx.EHPA == nil {
+		ctx.Recommendation.Status.Action = "Create"
+
+		newEhpa := &autoscalingapi.EffectiveHorizontalPodAutoscaler{
+			TypeMeta: metav1.TypeMeta{
+				Kind:       "EffectiveHorizontalPodAutoscaler",
+				APIVersion: autoscalingapi.GroupVersion.String(),
+			},
+			ObjectMeta: metav1.ObjectMeta{
+				Namespace: ctx.Recommendation.Spec.TargetRef.Namespace,
+				Name:      ctx.Recommendation.Spec.TargetRef.Name,
+			},
+			Spec: autoscalingapi.EffectiveHorizontalPodAutoscalerSpec{
+				MinReplicas:   proposedEHPA.MinReplicas,
+				MaxReplicas:   *proposedEHPA.MaxReplicas,
+				Metrics:       proposedEHPA.Metrics,
+				ScaleStrategy: autoscalingapi.ScaleStrategyPreview,
+				Prediction:    proposedEHPA.Prediction,
+				ScaleTargetRef: autoscalingv2.CrossVersionObjectReference{
+					Kind:       ctx.Recommendation.Spec.TargetRef.Kind,
+					APIVersion: ctx.Recommendation.Spec.TargetRef.APIVersion,
+					Name:       ctx.Recommendation.Spec.TargetRef.Name,
+				},
+			},
+		}
+
+		newEhpaBytes, err := json.Marshal(newEhpa)
+		if err != nil {
+			return fmt.Errorf("marshal ehpa failed %s. ", err)
+		}
+		ctx.Recommendation.Status.RecommendedInfo = string(newEhpaBytes)
+	} else {
+		ctx.Recommendation.Status.Action = "Patch"
+
+		patchEhpa := &autoscalingapi.EffectiveHorizontalPodAutoscaler{
+			Spec: autoscalingapi.EffectiveHorizontalPodAutoscalerSpec{
+				MinReplicas: proposedEHPA.MinReplicas,
+				MaxReplicas: *proposedEHPA.MaxReplicas,
+				Metrics:     proposedEHPA.Metrics,
+			},
+		}
+
+		patchEhpaBytes, err := json.Marshal(patchEhpa)
+		if err != nil {
+			return fmt.Errorf("marshal ehpa failed %s. ", err)
+		}
+		ctx.Recommendation.Status.RecommendedInfo = string(patchEhpaBytes)
+		ctx.Recommendation.Status.TargetRef = corev1.ObjectReference{
+			Namespace:  ctx.Recommendation.Spec.TargetRef.Namespace,
+			Name:       ctx.Recommendation.Spec.TargetRef.Name,
+			Kind:       "EffectiveHorizontalPodAutoscaler",
+			APIVersion: autoscalingapi.GroupVersion.String(),
+		}
+	}
+
 	return nil
 }
 

diff --git a/pkg/recommendation/recommender/hpa/registry.go b/pkg/recommendation/recommender/hpa/registry.go
@@ -27,7 +27,7 @@ func (rr *HPARecommender) Name() string {
 
 // NewHPARecommender create a new hpa recommender.
 func NewHPARecommender(recommender apis.Recommender) (*HPARecommender, error) {
-	predictable, exists := recommender.Config["replicas.predictable"]
+	predictable, exists := recommender.Config["predictable"]
 	if !exists {
 		predictable = "false"
 	}
@@ -36,7 +36,7 @@ func NewHPARecommender(recommender apis.Recommender) (*HPARecommender, error) {
 		return nil, err
 	}
 
-	referenceHPA, exists := recommender.Config["replicas.reference-hpa"]
+	referenceHPA, exists := recommender.Config["reference-hpa"]
 	if !exists {
 		referenceHPA = "true"
 	}