Skip to content

Commit

Permalink
Merge branch 'main' into validT
Browse files Browse the repository at this point in the history
  • Loading branch information
tomkerkhove authored Jun 9, 2023
2 parents 57740ed + 190c6e0 commit 552aac6
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
1 change: 1 addition & 0 deletions .github/workflows/pr-welcome.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- 'main'

permissions:
issues: write
pull-requests: write

jobs:
Expand Down
1 change: 0 additions & 1 deletion pkg/scaling/scale_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,6 @@ func (h *scaleHandler) ClearScalersCache(ctx context.Context, scalableObject int
/// --------------------------------------------------------------------------- ///

// GetScaledObjectMetrics returns metrics for specified metric name for a ScaledObject identified by it's name and namespace.
// The second return value are Prometheus metrics that needed to be exposed (used by DEPRECATED Prometheus Server on KEDA Metrics Server)
// It could either query the metric value directly from the scaler or from a cache, that's being stored for the scaler.
func (h *scaleHandler) GetScaledObjectMetrics(ctx context.Context, scaledObjectName, scaledObjectNamespace, metricName string) (*external_metrics.ExternalMetricValueList, error) {
logger := log.WithValues("scaledObject.Namespace", scaledObjectNamespace, "scaledObject.Name", scaledObjectName)
Expand Down

0 comments on commit 552aac6

Please sign in to comment.