From d7cef7d84731b86b721c0b73e08e35fe1c5ae758 Mon Sep 17 00:00:00 2001 From: Tom Kerkhove Date: Thu, 8 Jun 2023 14:21:49 +0200 Subject: [PATCH 1/4] chore: Improve deprecation for service monitor relabelings Signed-off-by: Tom Kerkhove --- keda/Notes.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/keda/Notes.txt b/keda/Notes.txt index a4f3e27a..d40373eb 100644 --- a/keda/Notes.txt +++ b/keda/Notes.txt @@ -17,5 +17,15 @@ Get details about a deployed ScaledObject: Get an overview of the Horizontal Pod Autoscalers (HPA) that KEDA is using behind the scenes: kubectl get hpa [--all-namespaces] [--namespace ] +{{- if .Values.prometheus.operator.serviceMonitor.relabellings}} +WARNING - prometheus.metricServer.operator.relabellings is deprecated, please migrate to prometheus.operator.serviceMonitor.relabelings instead. +{{- else }} +{{- if .Values.prometheus.metricServer.serviceMonitor.relabellings}} +WARNING - prometheus.metricServer.serviceMonitor.relabellings is deprecated, please migrate to prometheus.metricServer.serviceMonitor.relabelings instead. +{{- else }} +{{- if .Values.prometheus.webhooks.serviceMonitor.relabellings}} +WARNING - prometheus.webhooks.serviceMonitor.relabellings is deprecated, please migrate to prometheus.webhooks.serviceMonitor.relabelings instead. +{{- else }} + For more information on running KEDA, visit: -https://github.com/kedacore/keda/ \ No newline at end of file +https://github.com/kedacore/keda/ From 30d596338bfbc83806bd51fffb79445b93ef9c82 Mon Sep 17 00:00:00 2001 From: Tom Kerkhove Date: Thu, 8 Jun 2023 14:22:34 +0200 Subject: [PATCH 2/4] Update servicemonitor.yaml Signed-off-by: Tom Kerkhove --- keda/templates/manager/servicemonitor.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keda/templates/manager/servicemonitor.yaml b/keda/templates/manager/servicemonitor.yaml index 78be93d3..4bfaba2b 100644 --- a/keda/templates/manager/servicemonitor.yaml +++ b/keda/templates/manager/servicemonitor.yaml @@ -38,13 +38,13 @@ spec: {{- with .Values.prometheus.operator.serviceMonitor.scrapeTimeout }} scrapeTimeout: {{ . }} {{- end }} - {{- if .Values.prometheus.metricServer.serviceMonitor.relabelings}} - {{- with .Values.prometheus.metricServer.serviceMonitor.relabelings }} + {{- if .Values.prometheus.operator.serviceMonitor.relabelings}} + {{- with .Values.prometheus.operator.serviceMonitor.relabelings }} relabelings: {{- toYaml . | nindent 6 }} {{- end }} {{- else }} - {{- with .Values.prometheus.metricServer.serviceMonitor.relabellings }} + {{- with .Values.prometheus.operator.serviceMonitor.relabellings }} relabelings: {{- toYaml . | nindent 6 }} {{- end }} From c32c3483fb62dfea47e8094faff2600523b4b4f1 Mon Sep 17 00:00:00 2001 From: Tom Kerkhove Date: Thu, 8 Jun 2023 14:22:48 +0200 Subject: [PATCH 3/4] Update servicemonitor.yaml Signed-off-by: Tom Kerkhove --- keda/templates/webhooks/servicemonitor.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keda/templates/webhooks/servicemonitor.yaml b/keda/templates/webhooks/servicemonitor.yaml index 8baff86b..19ac4b67 100644 --- a/keda/templates/webhooks/servicemonitor.yaml +++ b/keda/templates/webhooks/servicemonitor.yaml @@ -39,13 +39,13 @@ spec: {{- with .Values.prometheus.webhooks.serviceMonitor.scrapeTimeout }} scrapeTimeout: {{ . }} {{- end }} - {{- if .Values.prometheus.metricServer.serviceMonitor.relabelings}} - {{- with .Values.prometheus.metricServer.serviceMonitor.relabelings }} + {{- if .Values.prometheus.webhooks.serviceMonitor.relabelings}} + {{- with .Values.prometheus.webhooks.serviceMonitor.relabelings }} relabelings: {{- toYaml . | nindent 6 }} {{- end }} {{- else }} - {{- with .Values.prometheus.metricServer.serviceMonitor.relabellings }} + {{- with .Values.prometheus.webhooks.serviceMonitor.relabellings }} relabelings: {{- toYaml . | nindent 6 }} {{- end }} From a90adfc6f9bbafa2452fe3664542e02fa0dd6e52 Mon Sep 17 00:00:00 2001 From: Tom Kerkhove Date: Thu, 8 Jun 2023 14:23:58 +0200 Subject: [PATCH 4/4] Update keda/Notes.txt Signed-off-by: Tom Kerkhove --- keda/Notes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keda/Notes.txt b/keda/Notes.txt index d40373eb..a529fcbe 100644 --- a/keda/Notes.txt +++ b/keda/Notes.txt @@ -18,7 +18,7 @@ Get an overview of the Horizontal Pod Autoscalers (HPA) that KEDA is using behin kubectl get hpa [--all-namespaces] [--namespace ] {{- if .Values.prometheus.operator.serviceMonitor.relabellings}} -WARNING - prometheus.metricServer.operator.relabellings is deprecated, please migrate to prometheus.operator.serviceMonitor.relabelings instead. +WARNING - prometheus.operator.serviceMonitor.relabellings is deprecated, please migrate to prometheus.operator.serviceMonitor.relabelings instead. {{- else }} {{- if .Values.prometheus.metricServer.serviceMonitor.relabellings}} WARNING - prometheus.metricServer.serviceMonitor.relabellings is deprecated, please migrate to prometheus.metricServer.serviceMonitor.relabelings instead.