From b8dbd298cf9001b1597a2756fd0be4fa4df2059f Mon Sep 17 00:00:00 2001 From: Jorge Turrado Ferrero Date: Thu, 29 Jun 2023 15:57:19 +0200 Subject: [PATCH] chore: Cherry-pick fixes for KEDA v2.11.1 (#4744) (#4752) Signed-off-by: Jorge Turrado Co-authored-by: Joel Smith --- CHANGELOG.md | 1 + pkg/scalers/prometheus_scaler.go | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9eabb27c352..d056c2ae4b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,7 @@ To learn more about active deprecations, we recommend checking [GitHub Discussio - **General**: Paused ScaledObject continues working after removing the annotation ([#4733](https://github.com/kedacore/keda/issues/4733)) - **General**: Skip resolving secrets if namespace is restricted ([#4519](https://github.com/kedacore/keda/issues/4519)) +- **Prometheus**: Authenticated connections to Prometheus work in non-PodIdenty case ([#4695](https://github.com/kedacore/keda/issues/4695)) ### Deprecations diff --git a/pkg/scalers/prometheus_scaler.go b/pkg/scalers/prometheus_scaler.go index c07f4c2dcc6..a5910be97fb 100644 --- a/pkg/scalers/prometheus_scaler.go +++ b/pkg/scalers/prometheus_scaler.go @@ -16,6 +16,7 @@ import ( v2 "k8s.io/api/autoscaling/v2" "k8s.io/metrics/pkg/apis/external_metrics" + kedav1alpha1 "github.com/kedacore/keda/v2/apis/keda/v1alpha1" "github.com/kedacore/keda/v2/pkg/scalers/authentication" "github.com/kedacore/keda/v2/pkg/scalers/azure" kedautil "github.com/kedacore/keda/v2/pkg/util" @@ -237,7 +238,7 @@ func parseAuthConfig(config *ScalerConfig, meta *prometheusMetadata) error { return err } - if auth != nil && config.PodIdentity.Provider != "" { + if auth != nil && !(config.PodIdentity.Provider == kedav1alpha1.PodIdentityProviderNone || config.PodIdentity.Provider == "") { return fmt.Errorf("pod identity cannot be enabled with other auth types") } meta.prometheusAuth = auth