From e9eb8136a630de6499822fd656c094c5963243e0 Mon Sep 17 00:00:00 2001 From: Pierre Mauduit Date: Thu, 5 Dec 2024 10:36:03 +0100 Subject: [PATCH] fix: acceptance - use portNumber instead of port port expects a pod port name, but I can't find anything in the k8s documentation to actually give a name to a port on a pod / container, it looks like named ports is a concept related only to services. so switching to `portNumber` instead. --- acceptance-tests/Chart.yaml | 2 +- acceptance-tests/templates/prometheus-pm.yaml | 2 +- acceptance-tests/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/acceptance-tests/Chart.yaml b/acceptance-tests/Chart.yaml index 33ce7fa..9ae094b 100644 --- a/acceptance-tests/Chart.yaml +++ b/acceptance-tests/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.5.2 +version: 0.5.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/acceptance-tests/templates/prometheus-pm.yaml b/acceptance-tests/templates/prometheus-pm.yaml index 3ba7d59..d39ecb0 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 }} - port: {{ .Values.podMonitor.httpPort | quote }} + portNumber: {{ .Values.podMonitor.httpPort }} selector: matchLabels: {{- with .Values.podMonitor.matchLabels }} diff --git a/acceptance-tests/values.yaml b/acceptance-tests/values.yaml index 30df3ce..031a4cb 100644 --- a/acceptance-tests/values.yaml +++ b/acceptance-tests/values.yaml @@ -68,6 +68,6 @@ podMonitor: matchLabels: app.kubernetes.io/name: apache-nas httpPath: /public/non-regression/report/export/prometheusData.txt - httpPort: "80" + httpPort: 80 # Should be set to a value coherent with the `job.schedule` parameter above. frequency: 1d