From b888279d4453ecb26c2b598798b5a6a876656ba3 Mon Sep 17 00:00:00 2001 From: Jorge Turrado Date: Thu, 24 Oct 2024 21:52:48 +0200 Subject: [PATCH] fix: e2e test issues solved Signed-off-by: Jorge Turrado --- pkg/scalers/kubernetes_workload_scaler.go | 12 ++++-------- tests/utils/helper/helper.go | 5 ++--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/pkg/scalers/kubernetes_workload_scaler.go b/pkg/scalers/kubernetes_workload_scaler.go index a3ceeaa0405..a2a658f7cba 100644 --- a/pkg/scalers/kubernetes_workload_scaler.go +++ b/pkg/scalers/kubernetes_workload_scaler.go @@ -33,7 +33,7 @@ var phasesCountedAsTerminated = []corev1.PodPhase{ type kubernetesWorkloadMetadata struct { PodSelector string `keda:"name=podSelector, order=triggerMetadata"` - Value float64 `keda:"name=value, order=triggerMetadata"` + Value float64 `keda:"name=value, order=triggerMetadata, default=0"` ActivationValue float64 `keda:"name=activationValue, order=triggerMetadata, default=0"` namespace string @@ -72,17 +72,13 @@ func NewKubernetesWorkloadScaler(kubeClient client.Client, config *scalersconfig func parseKubernetesWorkloadMetadata(config *scalersconfig.ScalerConfig) (kubernetesWorkloadMetadata, error) { meta := kubernetesWorkloadMetadata{} - err := config.TypedConfig(&meta) - if err != nil { - return meta, fmt.Errorf("error parsing kubernetes workload metadata: %w", err) - } - meta.namespace = config.ScalableObjectNamespace meta.triggerIndex = config.TriggerIndex meta.asMetricSource = config.AsMetricSource - if meta.asMetricSource { - meta.Value = 0 + err := config.TypedConfig(&meta) + if err != nil { + return meta, fmt.Errorf("error parsing kubernetes workload metadata: %w", err) } selector, err := labels.Parse(meta.PodSelector) diff --git a/tests/utils/helper/helper.go b/tests/utils/helper/helper.go index 039e5546b8c..3c618a8e4a6 100644 --- a/tests/utils/helper/helper.go +++ b/tests/utils/helper/helper.go @@ -51,8 +51,7 @@ image: repository: "otel/opentelemetry-collector-contrib" config: exporters: - logging: - loglevel: debug + debug: {} prometheus: endpoint: 0.0.0.0:8889 receivers: @@ -72,7 +71,7 @@ config: receivers: - otlp exporters: - - logging + - debug - prometheus logs: null `