From 6afbb7cb2516a7533d31f6bb83ad6dfba51a29fe Mon Sep 17 00:00:00 2001
From: Pierre Mauduit <pierre.mauduit@camptocamp.com>
Date: Thu, 5 Dec 2024 11:51:05 +0100
Subject: [PATCH] fix: acceptance - revert back to port instead of portNumber

Also adding an extra matchLabel in the default values
---
 acceptance-tests/templates/prometheus-pm.yaml | 2 +-
 acceptance-tests/values.yaml                  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/acceptance-tests/templates/prometheus-pm.yaml b/acceptance-tests/templates/prometheus-pm.yaml
index d39ecb0..38e933e 100644
--- a/acceptance-tests/templates/prometheus-pm.yaml
+++ b/acceptance-tests/templates/prometheus-pm.yaml
@@ -9,7 +9,7 @@ spec:
   podMetricsEndpoints:
   - interval: {{ .Values.podMonitor.frequency }}
     path: {{ .Values.podMonitor.httpPath }}
-    portNumber: {{ .Values.podMonitor.httpPort }}
+    port: {{ .Values.podMonitor.httpPort }}
   selector:
     matchLabels:
       {{- with .Values.podMonitor.matchLabels }}
diff --git a/acceptance-tests/values.yaml b/acceptance-tests/values.yaml
index 031a4cb..ac74753 100644
--- a/acceptance-tests/values.yaml
+++ b/acceptance-tests/values.yaml
@@ -67,7 +67,8 @@ podMonitor:
   # match the pod where prometheusData.txt is hosted
   matchLabels:
     app.kubernetes.io/name: apache-nas
+    app.kubernetes.io/instance: apache-nas
   httpPath: /public/non-regression/report/export/prometheusData.txt
-  httpPort: 80
+  httpPort: http
   # Should be set to a value coherent with the `job.schedule` parameter above.
   frequency: 1d