Fix ingress for grpc. (percona#272)

* Fix ingress for grpc. * Bump pmm chart version to 1.3.6.
gdubicki · Jan 15, 2024 · a7d60c3 · a7d60c3
1 parent d51e7d4
commit a7d60c3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git 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:

diff --git 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 }}
 ---