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

Use beta version of ingress #988

Merged
merged 1 commit into from
May 6, 2021
Merged

Use beta version of ingress #988

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
154 changes: 52 additions & 102 deletions helm/templates/common/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- if .Values.common.ingress.enabled }}
apiVersion: networking.k8s.io/v1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: {{ template "flyte.name" . }}
Expand All @@ -15,166 +15,122 @@ spec:
- path: /*
pathType: ImplementationSpecific
backend:
service:
name: ssl-redirect
port:
name: use-annotation
serviceName: ssl-redirect
servicePort: use-annotation
{{- end }}
# This is useful only for frontend development
{{- if .Values.common.ingress.webpackHMR }}
- path: /__webpack_hmr
pathType: ImplementationSpecific
backend:
service:
name: flyteconsole
port:
number: 80
serviceName: flyteconsole
servicePort: 80
{{- end }}
# Port 87 in FlyteAdmin maps to the redoc container.
- path: /openapi
pathType: ImplementationSpecific
backend:
service:
name: flyteadmin
port:
number: 87
serviceName: flyteadmin
servicePort: 87
# NOTE: If you change this, you must update the BASE_URL value in flyteconsole.yaml
- path: /console
pathType: ImplementationSpecific
backend:
service:
name: flyteconsole
port:
number: 80
serviceName: flyteconsole
servicePort: 80
- path: /console/*
pathType: ImplementationSpecific
backend:
service:
name: flyteconsole
port:
number: 80
serviceName: flyteconsole
servicePort: 80
- path: /api
pathType: ImplementationSpecific
backend:
service:
name: flyteadmin
port:
number: 80
serviceName: flyteadmin
servicePort: 80
- path: /api/*
pathType: ImplementationSpecific
backend:
service:
name: flyteadmin
port:
number: 80
serviceName: flyteadmin
servicePort: 80
- path: /healthcheck
pathType: ImplementationSpecific
backend:
service:
name: flyteadmin
port:
number: 80
serviceName: flyteadmin
servicePort: 80
- path: /v1/*
pathType: ImplementationSpecific
backend:
service:
name: flyteadmin
port:
number: 80
serviceName: flyteadmin
servicePort: 80
# Port 87 in FlyteAdmin maps to the redoc container.
- path: /openapi/*
pathType: ImplementationSpecific
backend:
service:
name: flyteadmin
port:
number: 80
serviceName: flyteadmin
servicePort: 80
- path: /.well-known/*
pathType: ImplementationSpecific
backend:
service:
name: flyteadmin
port:
number: 80
serviceName: flyteadmin
servicePort: 80
- path: /login
pathType: ImplementationSpecific
backend:
service:
name: flyteadmin
port:
number: 80
serviceName: flyteadmin
servicePort: 80
- path: /login/*
pathType: ImplementationSpecific
backend:
service:
name: flyteadmin
port:
number: 80
serviceName: flyteadmin
servicePort: 80
- path: /logout
pathType: ImplementationSpecific
backend:
service:
name: flyteadmin
port:
number: 80
serviceName: flyteadmin
servicePort: 80
- path: /logout/*
pathType: ImplementationSpecific
backend:
service:
name: flyteadmin
port:
number: 80
serviceName: flyteadmin
servicePort: 80
- path: /callback
pathType: ImplementationSpecific
backend:
service:
name: flyteadmin
port:
number: 80
serviceName: flyteadmin
servicePort: 80
- path: /callback/*
pathType: ImplementationSpecific
backend:
service:
name: flyteadmin
port:
number: 80
serviceName: flyteadmin
servicePort: 80
- path: /me
pathType: ImplementationSpecific
backend:
service:
name: flyteadmin
port:
number: 80
serviceName: flyteadmin
servicePort: 80
- path: /config
pathType: ImplementationSpecific
backend:
service:
name: flyteadmin
port:
number: 80
serviceName: flyteadmin
servicePort: 80
- path: /config/*
pathType: ImplementationSpecific
backend:
service:
name: flyteadmin
port:
number: 80
serviceName: flyteadmin
servicePort: 80
{{- if not .Values.common.ingress.separateGrpcIngress }}
# NOTE: Port 81 in flyteadmin is the GRPC server port for FlyteAdmin.
- path: /flyteidl.service.AdminService
pathType: ImplementationSpecific
backend:
service:
name: flyteadmin
port:
number: 81
serviceName: flyteadmin
servicePort: 81
- path: /flyteidl.service.AdminService/*
pathType: ImplementationSpecific
backend:
service:
name: flyteadmin
port:
number: 81
serviceName: flyteadmin
servicePort: 81
{{- end }}
{{- with .Values.common.ingress.host }}
host: {{ . }}
Expand All @@ -191,7 +147,7 @@ spec:
# Certain ingress controllers like nginx cannot serve HTTP 1 and GRPC with a single ingress because GRPC can only
# enabled on the ingress object, not on backend services (GRPC annotation is set on the ingress, not on the services).
---
apiVersion: networking.k8s.io/v1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: {{ template "flyte.name" . }}-grpc
Expand All @@ -209,28 +165,22 @@ spec:
paths:
{{- if .Values.common.ingress.albSSLRedirect }}
- backend:
service:
name: ssl-redirect
port:
name: use-annotation
serviceName: ssl-redirect
servicePort: use-annotation
path: /*
pathType: ImplementationSpecific
{{- end }}
# NOTE: Port 81 in flyteadmin is the GRPC server port for FlyteAdmin.
- path: /flyteidl.service.AdminService
pathType: ImplementationSpecific
backend:
service:
name: flyteadmin
port:
number: 81
serviceName: flyteadmin
servicePort: 81
- path: /flyteidl.service.AdminService/*
pathType: ImplementationSpecific
backend:
service:
name: flyteadmin
port:
number: 81
serviceName: flyteadmin
servicePort: 81
{{- with .Values.common.ingress.host }}
host: {{ . }}
{{- end }}
Expand Down