Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Set flyteadmin gRPC port to 80 in ingress if using TLS between load balancer and backend #3964

Merged
merged 2 commits into from
Nov 3, 2023
Merged

Fix: Set flyteadmin gRPC port to 80 in ingress if using TLS between load balancer and backend #3964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1ce514
Set admin grpc port to 80 in ingress if using TLS between load balanc…
Aug 15, 2023
bb5196c
Run 'make helm'
Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 28 additions & 24 deletions charts/flyte-core/templates/common/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 }}
Expand Down
1 change: 1 addition & 0 deletions deployment/eks/flyte_aws_scheduler_helm_generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deployment/eks/flyte_helm_controlplane_generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deployment/eks/flyte_helm_dataplane_generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deployment/eks/flyte_helm_generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deployment/gcp/flyte_helm_controlplane_generated.yaml
View file
Open in desktop
Original file line number Diff 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
1 change: 1 addition & 0 deletions deployment/gcp/flyte_helm_dataplane_generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deployment/gcp/flyte_helm_generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deployment/sandbox/flyte_helm_generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading