From 52bcb9a273aa0a3825b92f8c59f8ba4ea844cc87 Mon Sep 17 00:00:00 2001 From: Vladyslav Mostovyk Date: Tue, 19 Dec 2023 16:56:56 +0200 Subject: [PATCH 1/2] Fix ingress for grpc. --- charts/pmm/templates/ingress.yaml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/charts/pmm/templates/ingress.yaml b/charts/pmm/templates/ingress.yaml index 55f2894d..5af7679f 100644 --- a/charts/pmm/templates/ingress.yaml +++ b/charts/pmm/templates/ingress.yaml @@ -1,5 +1,6 @@ {{- if .Values.ingress.enabled -}} {{- $serviceName := .Values.service.name -}} +{{- $grpcPort := (index $.Values.service.ports 0).port -}} {{- $servicePort := (index $.Values.service.ports 1).port -}} {{- $ingressPathType := .Values.ingress.pathType -}} apiVersion: networking.k8s.io/v1 @@ -51,28 +52,28 @@ spec: service: name: {{ $serviceName }}-grpc port: - number: 443 # MUST proxy to HTTPS + number: {{ $grpcPort }} # MUST proxy to HTTPS - path: {{ printf "%s/inventory." . | replace "//" "/" }} pathType: {{ $ingressPathType }} backend: service: name: {{ $serviceName }}-grpc port: - number: 443 # MUST proxy to HTTPS + number: {{ $grpcPort }} # MUST proxy to HTTPS - path: {{ printf "%s/management." . | replace "//" "/" }} pathType: {{ $ingressPathType }} backend: service: name: {{ $serviceName }}-grpc port: - number: 443 # MUST proxy to HTTPS + number: {{ $grpcPort }} # MUST proxy to HTTPS - path: {{ printf "%s/server." . | replace "//" "/" }} pathType: {{ $ingressPathType }} backend: service: name: {{ $serviceName }}-grpc port: - number: 443 # MUST proxy to HTTPS + number: {{ $grpcPort }} # MUST proxy to HTTPS {{- end }} {{- end }} {{- end }} @@ -90,6 +91,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} nginx.ingress.kubernetes.io/backend-protocol: "GRPCS" + nginx.ingress.kubernetes.io/use-regex: "true" spec: {{- if .Values.ingress.ingressClassName }} ingressClassName: {{ .Values.ingress.ingressClassName | quote }} @@ -117,28 +119,28 @@ spec: service: name: {{ $serviceName }}-grpc port: - number: 443 # MUST proxy to HTTPS + number: {{ $grpcPort }} # MUST proxy to HTTPS - path: {{ printf "%s/inventory." . | replace "//" "/" }} pathType: {{ $ingressPathType }} backend: service: name: {{ $serviceName }}-grpc port: - number: 443 # MUST proxy to HTTPS + number: {{ $grpcPort }} # MUST proxy to HTTPS - path: {{ printf "%s/management." . | replace "//" "/" }} pathType: {{ $ingressPathType }} backend: service: name: {{ $serviceName }}-grpc port: - number: 443 # MUST proxy to HTTPS + number: {{ $grpcPort }} # MUST proxy to HTTPS - path: {{ printf "%s/server." . | replace "//" "/" }} pathType: {{ $ingressPathType }} backend: service: name: {{ $serviceName }}-grpc port: - number: 443 # MUST proxy to HTTPS + number: {{ $grpcPort }} # MUST proxy to HTTPS {{- end }} {{- end }} --- From 61a0182bcd2864af2064aabda8f545350248d80a Mon Sep 17 00:00:00 2001 From: Vladyslav Mostovyk Date: Wed, 20 Dec 2023 13:29:34 +0200 Subject: [PATCH 2/2] Bump pmm chart version to 1.3.6. --- charts/pmm/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/pmm/Chart.yaml b/charts/pmm/Chart.yaml index 56ca6287..89c3ffe2 100644 --- a/charts/pmm/Chart.yaml +++ b/charts/pmm/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: pmm description: A Helm chart for Percona Monitoring and Management (PMM) type: application -version: 1.3.5 +version: 1.3.6 appVersion: "2.41.0" home: https://github.com/percona/pmm maintainers: