From f950fd25ee8a3d101fe13e69bc2f9f48b9c764f6 Mon Sep 17 00:00:00 2001
From: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es>
Date: Sun, 11 Dec 2022 19:32:16 +0100
Subject: [PATCH] fix(keda): Remove unknown flag when enabling prometheus on
 the operator (#343)

Fixes https://github.com/kedacore/charts/issues/342
---
 .github/workflows/ci-core.yml          | 35 ++++++++++++++++++++++++--
 keda/templates/12-keda-deployment.yaml |  2 +-
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml
index 1f845772..df9d3fe3 100644
--- a/.github/workflows/ci-core.yml
+++ b/.github/workflows/ci-core.yml
@@ -79,14 +79,45 @@ jobs:
       run: |
         helm version
 
+    - name: Generate values
+      run: |
+        cat <<EOF > test-values.yaml
+        image:
+          keda:
+            tag: main
+          metricsApiServer:   
+            tag: main
+        podIdentity:
+          azureWorkload:
+            enabled: ${{ matrix.enableAzureWorkloadIdentity }}
+            tenantId: ${{ matrix.tenantId }}
+            clientId: ${{ matrix.clientId }}
+        podDisruptionBudget:
+          operator:
+            maxUnavailable: 1 
+          metricServer:
+            maxUnavailable: 1
+        prometheus:
+          operator:
+            enabled: true
+            podMonitor:
+              enabled: true
+        EOF
+
+    - name: Install deps
+      run: |
+        helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+        helm repo update
+        helm install prometheus-stack prometheus-community/kube-prometheus-stack --namespace monitoring --create-namespace --wait
+
     - name: Create KEDA namespace
       run: kubectl create ns keda
 
     - name: Template Helm chart
-      run: helm template keda ./keda/ --namespace keda --set podIdentity.azureWorkload.enabled=${{ matrix.enableAzureWorkloadIdentity }} --set podIdentity.azureWorkload.tenantId=${{ matrix.tenantId }} --set podIdentity.azureWorkload.clientId=${{ matrix.clientId }} --set podDisruptionBudget.operator.maxUnavailable=1 --set podDisruptionBudget.metricServer.maxUnavailable=1
+      run: helm template keda ./keda/ --namespace keda --values test-values.yaml
 
     - name: Install Helm chart
-      run: helm install keda ./keda/ --namespace keda --set podIdentity.azureWorkload.enabled=${{ matrix.enableAzureWorkloadIdentity }} --set podIdentity.azureWorkload.tenantId=${{ matrix.tenantId }} --set podIdentity.azureWorkload.clientId=${{ matrix.clientId }} --set podDisruptionBudget.operator.maxUnavailable=1 --set podDisruptionBudget.metricServer.maxUnavailable=1
+      run: helm install keda ./keda/ --namespace keda --values test-values.yaml --wait
 
     - name: Show Kubernetes resources
       run: kubectl get all --namespace keda
diff --git a/keda/templates/12-keda-deployment.yaml b/keda/templates/12-keda-deployment.yaml
index 680ebf77..b28bffde 100644
--- a/keda/templates/12-keda-deployment.yaml
+++ b/keda/templates/12-keda-deployment.yaml
@@ -73,7 +73,7 @@ spec:
           - "--zap-encoder={{ .Values.logging.operator.format }}"
           - "--zap-time-encoding={{ .Values.logging.operator.timeEncoding }}"
           {{- if .Values.prometheus.operator.enabled }}
-          - --metrics-port=:{{ .Values.prometheus.operator.port }}
+          - --metrics-bind-address=:{{ .Values.prometheus.operator.port }}
           {{- end }}
           {{- range $key, $value := .Values.extraArgs.keda }}
           - --{{ $key }}={{ $value }}