Fix: Set flyteadmin gRPC port to 80 in ingress if using TLS between l…

…oad balancer and backend (#3964) * Set admin grpc port to 80 in ingress if using TLS between load balancer and backend Signed-off-by: Fabio Grätz <[email protected]> * Run 'make helm' Signed-off-by: Fabio Grätz <[email protected]> --------- Signed-off-by: Fabio Grätz <[email protected]> Co-authored-by: Fabio Grätz <[email protected]>
flyteorg · Nov 3, 2023 · 6425a2a · 6425a2a
1 parent a1d182b
commit 6425a2a
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 24 deletions.
diff --git a/charts/flyte-core/templates/common/ingress.yaml b/charts/flyte-core/templates/common/ingress.yaml
@@ -1,4 +1,8 @@
 {{- define "grpcRoutes" -}}
+{{- $grpcPort := 81 -}}
+{{- if eq .Values.configmap.adminServer.server.security.secure true -}}
+  {{- $grpcPort = 80 -}}
+{{- end }}
 # NOTE: Port 81 in flyteadmin is the GRPC server port for FlyteAdmin.
 - path: /flyteidl.service.SignalService
   pathType: ImplementationSpecific
@@ -7,10 +11,10 @@
     service:
       name: flyteadmin
       port:
-        number: 81
+        number: {{ $grpcPort }}
 {{- else }}
     serviceName: flyteadmin
-    servicePort: 81
+    servicePort: {{ $grpcPort }}
 {{- end }}
 - path: /flyteidl.service.SignalService/*
   pathType: ImplementationSpecific
@@ -19,10 +23,10 @@
     service:
       name: flyteadmin
       port:
-        number: 81
+        number: {{ $grpcPort }}
 {{- else }}
     serviceName: flyteadmin
-    servicePort: 81
+    servicePort: {{ $grpcPort }}
 {{- end }}
 - path: /flyteidl.service.AdminService
   pathType: ImplementationSpecific
@@ -31,10 +35,10 @@
     service:
       name: flyteadmin
       port:
-        number: 81
+        number: {{ $grpcPort }}
 {{- else }}
     serviceName: flyteadmin
-    servicePort: 81
+    servicePort: {{ $grpcPort }}
 {{- end }}
 - path: /flyteidl.service.AdminService/*
   pathType: ImplementationSpecific
@@ -43,10 +47,10 @@
     service:
       name: flyteadmin
       port:
-        number: 81
+        number: {{ $grpcPort }}
 {{- else }}
     serviceName: flyteadmin
-    servicePort: 81
+    servicePort: {{ $grpcPort }}
 {{- end }}
 - path: /flyteidl.service.DataProxyService
   pathType: ImplementationSpecific
@@ -55,10 +59,10 @@
     service:
       name: flyteadmin
       port:
-        number: 81
+        number: {{ $grpcPort }}
 {{- else }}
     serviceName: flyteadmin
-    servicePort: 81
+    servicePort: {{ $grpcPort }}
 {{- end }}
 - path: /flyteidl.service.DataProxyService/*
   pathType: ImplementationSpecific
@@ -67,10 +71,10 @@
     service:
       name: flyteadmin
       port:
-        number: 81
+        number: {{ $grpcPort }}
 {{- else }}
     serviceName: flyteadmin
-    servicePort: 81
+    servicePort: {{ $grpcPort }}
 {{- end }}
 - path: /flyteidl.service.AuthMetadataService
   pathType: ImplementationSpecific
@@ -79,10 +83,10 @@
     service:
       name: flyteadmin
       port:
-        number: 81
+        number: {{ $grpcPort }}
 {{- else }}
     serviceName: flyteadmin
-    servicePort: 81
+    servicePort: {{ $grpcPort }}
 {{- end }}
 - path: /flyteidl.service.AuthMetadataService/*
   pathType: ImplementationSpecific
@@ -91,10 +95,10 @@
     service:
       name: flyteadmin
       port:
-        number: 81
+        number: {{ $grpcPort }}
 {{- else }}
     serviceName: flyteadmin
-    servicePort: 81
+    servicePort: {{ $grpcPort }}
 {{- end }}
 - path: /flyteidl.service.IdentityService
   pathType: ImplementationSpecific
@@ -103,10 +107,10 @@
     service:
       name: flyteadmin
       port:
-        number: 81
+        number: {{ $grpcPort }}
 {{- else }}
     serviceName: flyteadmin
-    servicePort: 81
+    servicePort: {{ $grpcPort }}
 {{- end }}
 - path: /flyteidl.service.IdentityService/*
   pathType: ImplementationSpecific
@@ -115,10 +119,10 @@
     service:
       name: flyteadmin
       port:
-        number: 81
+        number: {{ $grpcPort }}
 {{- else }}
     serviceName: flyteadmin
-    servicePort: 81
+    servicePort: {{ $grpcPort }}
 {{- end }}
 - path: /grpc.health.v1.Health
   pathType: ImplementationSpecific
@@ -127,10 +131,10 @@
     service:
       name: flyteadmin
       port:
-        number: 81
+        number: {{ $grpcPort }}
 {{- else }}
     serviceName: flyteadmin
-    servicePort: 81
+    servicePort: {{ $grpcPort }}
 {{- end }}
 - path: /grpc.health.v1.Health/*
   pathType: ImplementationSpecific
@@ -139,10 +143,10 @@
     service:
       name: flyteadmin
       port:
-        number: 81
+        number: {{ $grpcPort }}
 {{- else }}
     serviceName: flyteadmin
-    servicePort: 81
+    servicePort: {{ $grpcPort }}
 {{- end }}
   {{- end }}
   {{- if .Values.common.ingress.enabled }}

diff --git a/deployment/eks/flyte_aws_scheduler_helm_generated.yaml b/deployment/eks/flyte_aws_scheduler_helm_generated.yaml
@@ -1570,6 +1570,7 @@ spec:
           #   path: /*
           #   pathType: ImplementationSpecific
           #
+
           # NOTE: Port 81 in flyteadmin is the GRPC server port for FlyteAdmin.
           - path: /flyteidl.service.SignalService
             pathType: ImplementationSpecific

diff --git a/deployment/eks/flyte_helm_controlplane_generated.yaml b/deployment/eks/flyte_helm_controlplane_generated.yaml
@@ -1198,6 +1198,7 @@ spec:
           #   path: /*
           #   pathType: ImplementationSpecific
           #
+
           # NOTE: Port 81 in flyteadmin is the GRPC server port for FlyteAdmin.
           - path: /flyteidl.service.SignalService
             pathType: ImplementationSpecific

diff --git a/deployment/eks/flyte_helm_dataplane_generated.yaml b/deployment/eks/flyte_helm_dataplane_generated.yaml
@@ -771,6 +771,7 @@ spec:
           #   path: /*
           #   pathType: ImplementationSpecific
           #
+
           # NOTE: Port 81 in flyteadmin is the GRPC server port for FlyteAdmin.
           - path: /flyteidl.service.SignalService
             pathType: ImplementationSpecific

diff --git a/deployment/eks/flyte_helm_generated.yaml b/deployment/eks/flyte_helm_generated.yaml
@@ -1689,6 +1689,7 @@ spec:
           #   path: /*
           #   pathType: ImplementationSpecific
           #
+
           # NOTE: Port 81 in flyteadmin is the GRPC server port for FlyteAdmin.
           - path: /flyteidl.service.SignalService
             pathType: ImplementationSpecific

diff --git a/deployment/gcp/flyte_helm_controlplane_generated.yaml b/deployment/gcp/flyte_helm_controlplane_generated.yaml
@@ -1192,6 +1192,7 @@ spec:
       http:
         paths:
           #
+
           # NOTE: Port 81 in flyteadmin is the GRPC server port for FlyteAdmin.
           - path: /flyteidl.service.SignalService
             pathType: ImplementationSpecific

diff --git a/deployment/gcp/flyte_helm_dataplane_generated.yaml b/deployment/gcp/flyte_helm_dataplane_generated.yaml
@@ -757,6 +757,7 @@ spec:
       http:
         paths:
           #
+
           # NOTE: Port 81 in flyteadmin is the GRPC server port for FlyteAdmin.
           - path: /flyteidl.service.SignalService
             pathType: ImplementationSpecific

diff --git a/deployment/gcp/flyte_helm_generated.yaml b/deployment/gcp/flyte_helm_generated.yaml
@@ -1690,6 +1690,7 @@ spec:
       http:
         paths:
           #
+
           # NOTE: Port 81 in flyteadmin is the GRPC server port for FlyteAdmin.
           - path: /flyteidl.service.SignalService
             pathType: ImplementationSpecific

diff --git a/deployment/sandbox/flyte_helm_generated.yaml b/deployment/sandbox/flyte_helm_generated.yaml
@@ -7701,6 +7701,7 @@ spec:
                 name: flyteadmin
                 port:
                   number: 80
+
           # NOTE: Port 81 in flyteadmin is the GRPC server port for FlyteAdmin.
           - path: /flyteidl.service.SignalService
             pathType: ImplementationSpecific
-Original file line number
+Diff line change
@@ Expand Up / @@ -1192,6 +1192,7 @@ spec: @@
           http:
             paths:
               #
               # NOTE: Port 81 in flyteadmin is the GRPC server port for FlyteAdmin.
               - path: /flyteidl.service.SignalService
                 pathType: ImplementationSpecific
@@ Expand Down @@