not predict for memory in ehpa

gocrane · Feb 23, 2022 · 31f356a · 31f356a
1 parent 24e4783
commit 31f356a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 20 deletions.
diff --git a/pkg/controller/ehpa/hpa.go b/pkg/controller/ehpa/hpa.go
@@ -187,9 +187,9 @@ func (c *EffectiveHPAController) GetHPAMetrics(ctx context.Context, ehpa *autosc
 		for _, metric := range metrics {
 			// generate a custom metric for resource metric
 			if metric.Type == autoscalingv2.ResourceMetricSourceType {
-				name, err := GetPredictionMetricName(metric.Resource.Name)
-				if err != nil {
-					return nil, err
+				name := GetPredictionMetricName(metric.Resource.Name)
+				if len(name) == 0 {
+					continue
 				}
 
 				customMetric := &autoscalingv2.PodsMetricSource{
@@ -247,14 +247,12 @@ func (c *EffectiveHPAController) GetHPAMetrics(ctx context.Context, ehpa *autosc
 }
 
 // GetPredictionMetricName return metric name used by prediction
-func GetPredictionMetricName(Name v1.ResourceName) (string, error) {
+func GetPredictionMetricName(Name v1.ResourceName) string {
 	switch Name {
 	case v1.ResourceCPU:
-		return known.MetricNamePodCpuUsage, nil
-	case v1.ResourceMemory:
-		return known.MetricNamePodMemoryUsage, nil
+		return known.MetricNamePodCpuUsage
 	default:
-		return "", fmt.Errorf("resource name not predictable")
+		return ""
 	}
 }
 

diff --git a/pkg/controller/ehpa/predict.go b/pkg/controller/ehpa/predict.go
@@ -129,9 +129,9 @@ func (c *EffectiveHPAController) NewPredictionObject(ehpa *autoscalingapi.Effect
 	for _, metric := range ehpa.Spec.Metrics {
 		// Convert resource metric into prediction metric
 		if metric.Type == autoscalingv2.ResourceMetricSourceType {
-			metricName, err := GetPredictionMetricName(metric.Resource.Name)
-			if err != nil {
-				return nil, err
+			metricName := GetPredictionMetricName(metric.Resource.Name)
+			if len(metricName) == 0 {
+				continue
 			}
 
 			predictionMetrics = append(predictionMetrics, predictionapi.PredictionMetric{

diff --git a/pkg/known/const.go b/pkg/known/const.go
@@ -5,6 +5,5 @@ const (
 )
 
 const (
-	MetricNamePodCpuUsage    = "pod_cpu_usage"
-	MetricNamePodMemoryUsage = "pod_memory_usage"
+	MetricNamePodCpuUsage    = "crane_pod_cpu_usage"
 )
diff --git a/pkg/metricprovider/provider.go b/pkg/metricprovider/provider.go
@@ -157,8 +157,6 @@ func (p *MetricProvider) GetMetricBySelector(ctx context.Context, namespace stri
 
 		if info.Metric == known.MetricNamePodCpuUsage {
 			metric.Value = *resource.NewMilliQuantity(averageValue, resource.DecimalSI)
-		} else if info.Metric == known.MetricNamePodMemoryUsage {
-			metric.Value = *resource.NewMilliQuantity(averageValue, resource.BinarySI)
 		}
 
 		matchingMetrics = append(matchingMetrics, metric)
@@ -189,11 +187,6 @@ func ListAllLocalMetrics() []provider.CustomMetricInfo {
 			Namespaced:    true,
 			Metric:        known.MetricNamePodCpuUsage,
 		},
-		{
-			GroupResource: schema.GroupResource{Group: "", Resource: "pods"},
-			Namespaced:    true,
-			Metric:        known.MetricNamePodMemoryUsage,
-		},
 	}
 }