renamed evaluate and reverted tool.go

kubernetes-sigs · Jun 12, 2023 · cbe0554 · cbe0554
1 parent 029d2bd
commit cbe0554
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/hack/tools/tools.go b/hack/tools/tools.go
@@ -22,8 +22,11 @@ limitations under the License.
 package tools
 
 import (
-	// gen-crd-api-reference-docs
-	_ "github.com/ahmetb/gen-crd-api-reference-docs"
 	// code-generator
 	_ "k8s.io/code-generator"
+
+	// gen-crd-api-reference-docs
+	_ "github.com/ahmetb/gen-crd-api-reference-docs"
 )
+
+
diff --git a/pkg/kwok/metrics/cel/evaluate.go b/pkg/kwok/metrics/cel/evaluate.go
@@ -166,8 +166,8 @@ type Evaluator struct {
 	program cel.Program
 }
 
-// EvaluateMetric evaluates a cel program and returns a metric value
-func (e *Evaluator) EvaluateMetric(node *corev1.Node) (float64, error) {
+// EvaluateFloat64 evaluates a cel program and returns a metric value and returns float64.
+func (e *Evaluator) EvaluateFloat64(node *corev1.Node) (float64, error) {
 	refVal, _, err := e.program.Eval(map[string]any{
 		"node": node,
 	})

diff --git a/pkg/kwok/metrics/cel/evaluate_test.go b/pkg/kwok/metrics/cel/evaluate_test.go
@@ -51,7 +51,7 @@ func TestNodeEvaluation(t *testing.T) {
 		t.Fatalf("failed to compile expression: %v", err)
 	}
 
-	actual, err := eval.EvaluateMetric(n)
+	actual, err := eval.EvaluateFloat64(n)
 	if err != nil {
 		t.Fatalf("evaluation failed: %v", err)
 	}

diff --git a/pkg/kwok/metrics/metrics.go b/pkg/kwok/metrics/metrics.go
@@ -141,7 +141,7 @@ func (h *UpdateHandler) init() error {
 					return err
 				}
 
-				result, err := eval.EvaluateMetric(nodeInfo.Node)
+				result, err := eval.EvaluateFloat64(nodeInfo.Node)
 				if err != nil {
 					return fmt.Errorf("failed to evaluate metric %q: %w", m.Name, err)
 				}
@@ -195,7 +195,7 @@ func (h *UpdateHandler) init() error {
 					return err
 				}
 
-				result, err := eval.EvaluateMetric(nodeInfo.Node)
+				result, err := eval.EvaluateFloat64(nodeInfo.Node)
 				if err != nil {
 					return fmt.Errorf("failed to evaluate metric %q: %w", m.Name, err)
 				}
@@ -264,7 +264,7 @@ func (h *UpdateHandler) init() error {
 					if !ok {
 						return fmt.Errorf("failed to find program for metric %v", b.Le)
 					}
-					value, err := prog.EvaluateMetric(nodeInfo.Node)
+					value, err := prog.EvaluateFloat64(nodeInfo.Node)
 					if err != nil {
 						return fmt.Errorf("failed to evaluate metric with Le(%v): %w", b.Le, err)
 					}