chore: Cherry-pick fixes for KEDA v2.11.1 (#4744) (#4752)

JorTurFer · joelsmith · web-flow · commit b8dbd298cf90 · 2023-06-29T15:57:19.000+02:00
Signed-off-by: Jorge Turrado &lt;jorge.turrado@scrm.lidl&gt;
Co-authored-by: Joel Smith &lt;joelsmith@users.noreply.github.com&gt;
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ import (`
`16`	`16`	`v2 "k8s.io/api/autoscaling/v2"`
`17`	`17`	`"k8s.io/metrics/pkg/apis/external_metrics"`
`18`	`18`
	`19`	`+ kedav1alpha1 "github.com/kedacore/keda/v2/apis/keda/v1alpha1"`
`19`	`20`	`"github.com/kedacore/keda/v2/pkg/scalers/authentication"`
`20`	`21`	`"github.com/kedacore/keda/v2/pkg/scalers/azure"`
`21`	`22`	`kedautil "github.com/kedacore/keda/v2/pkg/util"`
`@@ -237,7 +238,7 @@ func parseAuthConfig(config ScalerConfig, meta prometheusMetadata) error {`
`237`	`238`	`return err`
`238`	`239`	`}`
`239`	`240`
`240`		`- if auth != nil && config.PodIdentity.Provider != "" {`
	`241`	`+ if auth != nil && !(config.PodIdentity.Provider == kedav1alpha1.PodIdentityProviderNone \|\| config.PodIdentity.Provider == "") {`
`241`	`242`	`return fmt.Errorf("pod identity cannot be enabled with other auth types")`
`242`	`243`	`}`
`243`	`244`	`meta.prometheusAuth = auth`