Skip to content

Commit

Permalink
fix: e2e test issues solved
Browse files Browse the repository at this point in the history
Signed-off-by: Jorge Turrado <[email protected]>
  • Loading branch information
JorTurFer committed Oct 24, 2024
1 parent b2ce95d commit b888279
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
12 changes: 4 additions & 8 deletions pkg/scalers/kubernetes_workload_scaler.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
5 changes: 2 additions & 3 deletions tests/utils/helper/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ image:
repository: "otel/opentelemetry-collector-contrib"
config:
exporters:
logging:
loglevel: debug
debug: {}
prometheus:
endpoint: 0.0.0.0:8889
receivers:
Expand All @@ -72,7 +71,7 @@ config:
receivers:
- otlp
exporters:
- logging
- debug
- prometheus
logs: null
`
Expand Down

0 comments on commit b888279

Please sign in to comment.