From 31a71fd69d8cc5e0c68dc1296d74e95200ef9729 Mon Sep 17 00:00:00 2001 From: erjxsrn Date: Fri, 10 Oct 2025 12:51:46 +0100 Subject: [PATCH] Fixed duplicate data in metrics. The port infomration in the network policy is modified. --- .../templates/deployment/deployment.yaml | 2 +- .../templates/network-policy/network-policy.yaml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/charts/eric-oss-hello-world-python-app/templates/deployment/deployment.yaml b/charts/eric-oss-hello-world-python-app/templates/deployment/deployment.yaml index dd38d91..e4523a8 100644 --- a/charts/eric-oss-hello-world-python-app/templates/deployment/deployment.yaml +++ b/charts/eric-oss-hello-world-python-app/templates/deployment/deployment.yaml @@ -39,7 +39,7 @@ spec: {{- if not (semverCompare ">=1.30.0" .Capabilities.KubeVersion.GitVersion) }} container.apparmor.security.beta.kubernetes.io/eric-oss-hello-world-python-app: {{ include "eric-oss-hello-world-python-app.appArmorProfileAnnotation" . | default "runtime/default" }} {{- end }} - prometheus.io/port: "{{ .Values.service.port }}" + prometheus.io/port: '{{ index .Values.service "http-port" }}' prometheus.io/scrape: "{{ .Values.prometheus.scrape }}" prometheus.io/path: "{{ .Values.prometheus.path }}" {{- include "eric-oss-hello-world-python-app.product-info" . | indent 8 }} diff --git a/charts/eric-oss-hello-world-python-app/templates/network-policy/network-policy.yaml b/charts/eric-oss-hello-world-python-app/templates/network-policy/network-policy.yaml index 142bfe7..6dc9da5 100644 --- a/charts/eric-oss-hello-world-python-app/templates/network-policy/network-policy.yaml +++ b/charts/eric-oss-hello-world-python-app/templates/network-policy/network-policy.yaml @@ -25,5 +25,8 @@ spec: matchLabels: app: eric-pm-server ports: - - port: {{ .Values.service.port }} + - protocol: TCP + port: {{ index .Values.service "http-port" }} + - protocol: TCP + port: {{ index .Values.service "https-port" }}