fix: acceptance - revert back to port instead of portNumber

Also adding an extra matchLabel in the default values
camptocamp · Dec 5, 2024 · 6afbb7c · 6afbb7c
1 parent 3596760
commit 6afbb7c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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