From 75e595adf7212ae754ec2d30e6f71718b36c38dc Mon Sep 17 00:00:00 2001 From: Ryan Lo Date: Sat, 24 Feb 2024 17:20:07 +0800 Subject: [PATCH 01/10] [BUG] separateGrpcIngress flag not working in flyte-binary helm chart Signed-off-by: Ryan Lo --- charts/flyte-binary/templates/_helpers.tpl | 90 +++++++++++++++++++ .../flyte-binary/templates/ingress/grpc.yaml | 87 +----------------- .../flyte-binary/templates/ingress/http.yaml | 6 ++ charts/flyte-binary/values.yaml | 4 +- 4 files changed, 101 insertions(+), 86 deletions(-) diff --git a/charts/flyte-binary/templates/_helpers.tpl b/charts/flyte-binary/templates/_helpers.tpl index 92e8fa4636..2b703923aa 100644 --- a/charts/flyte-binary/templates/_helpers.tpl +++ b/charts/flyte-binary/templates/_helpers.tpl @@ -176,6 +176,96 @@ Get the Flyte service GRPC port. {{- default 8089 .Values.service.ports.grpc -}} {{- end -}} +{{/* +Get the Flyte ingress GRPC paths +*/}} +{{- define "flyte-binary.ingress.grpc.paths" -}} +- path: /flyteidl.service.AdminService + pathType: ImplementationSpecific + backend: + service: + name: {{ include "flyte-binary.service.grpc.name" . }} + port: + number: {{ include "flyte-binary.service.grpc.port" . }} +- path: /flyteidl.service.AdminService/* + pathType: ImplementationSpecific + backend: + service: + name: {{ include "flyte-binary.service.grpc.name" . }} + port: + number: {{ include "flyte-binary.service.grpc.port" . }} +- path: /flyteidl.service.DataProxyService + pathType: ImplementationSpecific + backend: + service: + name: {{ include "flyte-binary.service.grpc.name" . }} + port: + number: {{ include "flyte-binary.service.grpc.port" . }} +- path: /flyteidl.service.DataProxyService/* + pathType: ImplementationSpecific + backend: + service: + name: {{ include "flyte-binary.service.grpc.name" . }} + port: + number: {{ include "flyte-binary.service.grpc.port" . }} +- path: /flyteidl.service.AuthMetadataService + pathType: ImplementationSpecific + backend: + service: + name: {{ include "flyte-binary.service.grpc.name" . }} + port: + number: {{ include "flyte-binary.service.grpc.port" . }} +- path: /flyteidl.service.AuthMetadataService/* + pathType: ImplementationSpecific + backend: + service: + name: {{ include "flyte-binary.service.grpc.name" . }} + port: + number: {{ include "flyte-binary.service.grpc.port" . }} +- path: /flyteidl.service.IdentityService + pathType: ImplementationSpecific + backend: + service: + name: {{ include "flyte-binary.service.grpc.name" . }} + port: + number: {{ include "flyte-binary.service.grpc.port" . }} +- path: /flyteidl.service.IdentityService/* + pathType: ImplementationSpecific + backend: + service: + name: {{ include "flyte-binary.service.grpc.name" . }} + port: + number: {{ include "flyte-binary.service.grpc.port" . }} +- path: /grpc.health.v1.Health + pathType: ImplementationSpecific + backend: + service: + name: {{ include "flyte-binary.service.grpc.name" . }} + port: + number: {{ include "flyte-binary.service.grpc.port" . }} +- path: /grpc.health.v1.Health/* + pathType: ImplementationSpecific + backend: + service: + name: {{ include "flyte-binary.service.grpc.name" . }} + port: + number: {{ include "flyte-binary.service.grpc.port" . }} +- path: /flyteidl.service.SignalService + pathType: ImplementationSpecific + backend: + service: + name: {{ include "flyte-binary.service.grpc.name" . }} + port: + number: {{ include "flyte-binary.service.grpc.port" . }} +- path: /flyteidl.service.SignalService/* + pathType: ImplementationSpecific + backend: + service: + name: {{ include "flyte-binary.service.grpc.name" . }} + port: + number: {{ include "flyte-binary.service.grpc.port" . }} +{{- end -}} + {{/* Get the Flyte agent service GRPC port. */}} diff --git a/charts/flyte-binary/templates/ingress/grpc.yaml b/charts/flyte-binary/templates/ingress/grpc.yaml index 427600336b..5a42b9958c 100644 --- a/charts/flyte-binary/templates/ingress/grpc.yaml +++ b/charts/flyte-binary/templates/ingress/grpc.yaml @@ -1,4 +1,4 @@ -{{- if .Values.ingress.create }} +{{- if and .Values.ingress.create .Values.ingress.separateGrpcIngress }} apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -38,90 +38,7 @@ spec: {{- if .Values.ingress.grpcExtraPaths.prepend }} {{- tpl ( .Values.ingress.grpcExtraPaths.prepend | toYaml ) . | nindent 6 }} {{- end }} - - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} - path: /flyteidl.service.AdminService - pathType: ImplementationSpecific - - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} - path: /flyteidl.service.AdminService/* - pathType: ImplementationSpecific - - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} - path: /flyteidl.service.DataProxyService - pathType: ImplementationSpecific - - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} - path: /flyteidl.service.DataProxyService/* - pathType: ImplementationSpecific - - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} - path: /flyteidl.service.AuthMetadataService - pathType: ImplementationSpecific - - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} - path: /flyteidl.service.AuthMetadataService/* - pathType: ImplementationSpecific - - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} - path: /flyteidl.service.IdentityService - pathType: ImplementationSpecific - - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} - path: /flyteidl.service.IdentityService/* - pathType: ImplementationSpecific - - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} - path: /grpc.health.v1.Health - pathType: ImplementationSpecific - - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} - path: /grpc.health.v1.Health/* - pathType: ImplementationSpecific - - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} - path: /flyteidl.service.SignalService - pathType: ImplementationSpecific - - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} - path: /flyteidl.service.SignalService/* - pathType: ImplementationSpecific + {{- include "flyte-binary.ingress.grpc.paths" . | nindent 6 }} {{- if .Values.ingress.grpcExtraPaths.append }} {{- tpl ( .Values.ingress.grpcExtraPaths.append | toYaml ) . | nindent 6 }} {{- end }} diff --git a/charts/flyte-binary/templates/ingress/http.yaml b/charts/flyte-binary/templates/ingress/http.yaml index 5c2a7ad1c7..55ebbfb9a2 100644 --- a/charts/flyte-binary/templates/ingress/http.yaml +++ b/charts/flyte-binary/templates/ingress/http.yaml @@ -21,6 +21,9 @@ metadata: {{- if .Values.ingress.httpAnnotations }} {{- tpl ( .Values.ingress.httpAnnotations | toYaml ) . | nindent 4 }} {{- end }} + {{- if not .Values.ingress.separateGrpcIngress }} + nginx.ingress.kubernetes.io/backend-protocol: "GRPC" + {{- end }} spec: {{- if .Values.ingress.httpIngressClassName }} ingressClassName: {{ .Values.ingress.httpIngressClassName | quote }} @@ -171,6 +174,9 @@ spec: number: {{ include "flyte-binary.service.http.port" . }} path: /oauth2/* pathType: ImplementationSpecific + {{- if not .Values.ingress.separateGrpcIngress }} + {{- include "flyte-binary.ingress.grpc.paths" . | nindent 6 }} + {{- end }} {{- if .Values.ingress.httpExtraPaths.append }} {{- tpl ( .Values.ingress.httpExtraPaths.append | toYaml ) . | nindent 6 }} {{- end }} diff --git a/charts/flyte-binary/values.yaml b/charts/flyte-binary/values.yaml index 3b95aed614..8b0daf0ebb 100644 --- a/charts/flyte-binary/values.yaml +++ b/charts/flyte-binary/values.yaml @@ -324,11 +324,13 @@ service: # ingress Configure ingress for Flyte ingress: # create Create ingress resources - create: false + create: true # labels Add labels to ingress resources labels: {} # host Hostname to bind to ingress resources host: "" + # separateGrpcIngress Create a separate ingress resource for GRPC if true. Required for certain ingress controllers like nginx. + separateGrpcIngress: true # commonAnnotations Add common annotations to all ingress resources commonAnnotations: {} # httpAnnotations Add annotations to http ingress resource From 7afee88658a2109a946835d870a66aead0a0c4fb Mon Sep 17 00:00:00 2001 From: Ryan Lo Date: Sat, 24 Feb 2024 17:23:21 +0800 Subject: [PATCH 02/10] make helm Signed-off-by: Ryan Lo --- charts/flyte-binary/README.md | 3 +- .../flyte_sandbox_binary_helm_generated.yaml | 253 ++++++++++++++++++ 2 files changed, 255 insertions(+), 1 deletion(-) diff --git a/charts/flyte-binary/README.md b/charts/flyte-binary/README.md index 9d1c3ddb54..350df001bb 100644 --- a/charts/flyte-binary/README.md +++ b/charts/flyte-binary/README.md @@ -124,7 +124,7 @@ Chart for basic single Flyte executable deployment | flyteagent.enabled | bool | `false` | | | fullnameOverride | string | `""` | | | ingress.commonAnnotations | object | `{}` | | -| ingress.create | bool | `false` | | +| ingress.create | bool | `true` | | | ingress.grpcAnnotations | object | `{}` | | | ingress.grpcExtraPaths.append | list | `[]` | | | ingress.grpcExtraPaths.prepend | list | `[]` | | @@ -138,6 +138,7 @@ Chart for basic single Flyte executable deployment | ingress.httpTls | list | `[]` | | | ingress.ingressClassName | string | `""` | | | ingress.labels | object | `{}` | | +| ingress.separateGrpcIngress | bool | `true` | | | ingress.tls | list | `[]` | | | nameOverride | string | `""` | | | rbac.annotations | object | `{}` | | diff --git a/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml b/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml index a8c637e0a3..0a52a2d4d6 100644 --- a/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml +++ b/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml @@ -436,3 +436,256 @@ spec: name: flyte-flyte-binary-config-secret - name: state emptyDir: {} +--- +# Source: flyte-binary/templates/ingress/grpc.yaml +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: flyte-flyte-binary-grpc + namespace: "flyte" + labels: + helm.sh/chart: flyte-binary-v0.1.10 + app.kubernetes.io/name: flyte-binary + app.kubernetes.io/instance: flyte + app.kubernetes.io/version: "1.16.0" + app.kubernetes.io/managed-by: Helm + annotations: +spec: + rules: + - http: + paths: + - path: /flyteidl.service.AdminService + pathType: ImplementationSpecific + backend: + service: + name: flyte-flyte-binary-grpc + port: + number: 8089 + - path: /flyteidl.service.AdminService/* + pathType: ImplementationSpecific + backend: + service: + name: flyte-flyte-binary-grpc + port: + number: 8089 + - path: /flyteidl.service.DataProxyService + pathType: ImplementationSpecific + backend: + service: + name: flyte-flyte-binary-grpc + port: + number: 8089 + - path: /flyteidl.service.DataProxyService/* + pathType: ImplementationSpecific + backend: + service: + name: flyte-flyte-binary-grpc + port: + number: 8089 + - path: /flyteidl.service.AuthMetadataService + pathType: ImplementationSpecific + backend: + service: + name: flyte-flyte-binary-grpc + port: + number: 8089 + - path: /flyteidl.service.AuthMetadataService/* + pathType: ImplementationSpecific + backend: + service: + name: flyte-flyte-binary-grpc + port: + number: 8089 + - path: /flyteidl.service.IdentityService + pathType: ImplementationSpecific + backend: + service: + name: flyte-flyte-binary-grpc + port: + number: 8089 + - path: /flyteidl.service.IdentityService/* + pathType: ImplementationSpecific + backend: + service: + name: flyte-flyte-binary-grpc + port: + number: 8089 + - path: /grpc.health.v1.Health + pathType: ImplementationSpecific + backend: + service: + name: flyte-flyte-binary-grpc + port: + number: 8089 + - path: /grpc.health.v1.Health/* + pathType: ImplementationSpecific + backend: + service: + name: flyte-flyte-binary-grpc + port: + number: 8089 + - path: /flyteidl.service.SignalService + pathType: ImplementationSpecific + backend: + service: + name: flyte-flyte-binary-grpc + port: + number: 8089 + - path: /flyteidl.service.SignalService/* + pathType: ImplementationSpecific + backend: + service: + name: flyte-flyte-binary-grpc + port: + number: 8089 +--- +# Source: flyte-binary/templates/ingress/http.yaml +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: flyte-flyte-binary-http + namespace: "flyte" + labels: + helm.sh/chart: flyte-binary-v0.1.10 + app.kubernetes.io/name: flyte-binary + app.kubernetes.io/instance: flyte + app.kubernetes.io/version: "1.16.0" + app.kubernetes.io/managed-by: Helm + annotations: +spec: + rules: + - http: + paths: + - backend: + service: + name: flyte-flyte-binary-http + port: + number: 8088 + path: /console + pathType: ImplementationSpecific + - backend: + service: + name: flyte-flyte-binary-http + port: + number: 8088 + path: /console/* + pathType: ImplementationSpecific + - backend: + service: + name: flyte-flyte-binary-http + port: + number: 8088 + path: /api + pathType: ImplementationSpecific + - backend: + service: + name: flyte-flyte-binary-http + port: + number: 8088 + path: /api/* + pathType: ImplementationSpecific + - backend: + service: + name: flyte-flyte-binary-http + port: + number: 8088 + path: /healthcheck + pathType: ImplementationSpecific + - backend: + service: + name: flyte-flyte-binary-http + port: + number: 8088 + path: /v1/* + pathType: ImplementationSpecific + - backend: + service: + name: flyte-flyte-binary-http + port: + number: 8088 + path: /.well-known + pathType: ImplementationSpecific + - backend: + service: + name: flyte-flyte-binary-http + port: + number: 8088 + path: /.well-known/* + pathType: ImplementationSpecific + - backend: + service: + name: flyte-flyte-binary-http + port: + number: 8088 + path: /login + pathType: ImplementationSpecific + - backend: + service: + name: flyte-flyte-binary-http + port: + number: 8088 + path: /login/* + pathType: ImplementationSpecific + - backend: + service: + name: flyte-flyte-binary-http + port: + number: 8088 + path: /logout + pathType: ImplementationSpecific + - backend: + service: + name: flyte-flyte-binary-http + port: + number: 8088 + path: /logout/* + pathType: ImplementationSpecific + - backend: + service: + name: flyte-flyte-binary-http + port: + number: 8088 + path: /callback + pathType: ImplementationSpecific + - backend: + service: + name: flyte-flyte-binary-http + port: + number: 8088 + path: /callback/* + pathType: ImplementationSpecific + - backend: + service: + name: flyte-flyte-binary-http + port: + number: 8088 + path: /me + pathType: ImplementationSpecific + - backend: + service: + name: flyte-flyte-binary-http + port: + number: 8088 + path: /config + pathType: ImplementationSpecific + - backend: + service: + name: flyte-flyte-binary-http + port: + number: 8088 + path: /config/* + pathType: ImplementationSpecific + - backend: + service: + name: flyte-flyte-binary-http + port: + number: 8088 + path: /oauth2 + pathType: ImplementationSpecific + - backend: + service: + name: flyte-flyte-binary-http + port: + number: 8088 + path: /oauth2/* + pathType: ImplementationSpecific From 124b62c73b02b8434e709ba0727c3a124d9fae71 Mon Sep 17 00:00:00 2001 From: Ryan Lo Date: Sat, 24 Feb 2024 18:31:09 +0800 Subject: [PATCH 03/10] revise Signed-off-by: Ryan Lo --- charts/flyte-binary/README.md | 2 +- charts/flyte-binary/values.yaml | 2 +- .../flyte_sandbox_binary_helm_generated.yaml | 253 ------------------ 3 files changed, 2 insertions(+), 255 deletions(-) diff --git a/charts/flyte-binary/README.md b/charts/flyte-binary/README.md index 350df001bb..d9b0cbbb11 100644 --- a/charts/flyte-binary/README.md +++ b/charts/flyte-binary/README.md @@ -124,7 +124,7 @@ Chart for basic single Flyte executable deployment | flyteagent.enabled | bool | `false` | | | fullnameOverride | string | `""` | | | ingress.commonAnnotations | object | `{}` | | -| ingress.create | bool | `true` | | +| ingress.create | bool | `false` | | | ingress.grpcAnnotations | object | `{}` | | | ingress.grpcExtraPaths.append | list | `[]` | | | ingress.grpcExtraPaths.prepend | list | `[]` | | diff --git a/charts/flyte-binary/values.yaml b/charts/flyte-binary/values.yaml index 8b0daf0ebb..038553cfae 100644 --- a/charts/flyte-binary/values.yaml +++ b/charts/flyte-binary/values.yaml @@ -324,7 +324,7 @@ service: # ingress Configure ingress for Flyte ingress: # create Create ingress resources - create: true + create: false # labels Add labels to ingress resources labels: {} # host Hostname to bind to ingress resources diff --git a/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml b/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml index 0a52a2d4d6..a8c637e0a3 100644 --- a/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml +++ b/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml @@ -436,256 +436,3 @@ spec: name: flyte-flyte-binary-config-secret - name: state emptyDir: {} ---- -# Source: flyte-binary/templates/ingress/grpc.yaml -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: flyte-flyte-binary-grpc - namespace: "flyte" - labels: - helm.sh/chart: flyte-binary-v0.1.10 - app.kubernetes.io/name: flyte-binary - app.kubernetes.io/instance: flyte - app.kubernetes.io/version: "1.16.0" - app.kubernetes.io/managed-by: Helm - annotations: -spec: - rules: - - http: - paths: - - path: /flyteidl.service.AdminService - pathType: ImplementationSpecific - backend: - service: - name: flyte-flyte-binary-grpc - port: - number: 8089 - - path: /flyteidl.service.AdminService/* - pathType: ImplementationSpecific - backend: - service: - name: flyte-flyte-binary-grpc - port: - number: 8089 - - path: /flyteidl.service.DataProxyService - pathType: ImplementationSpecific - backend: - service: - name: flyte-flyte-binary-grpc - port: - number: 8089 - - path: /flyteidl.service.DataProxyService/* - pathType: ImplementationSpecific - backend: - service: - name: flyte-flyte-binary-grpc - port: - number: 8089 - - path: /flyteidl.service.AuthMetadataService - pathType: ImplementationSpecific - backend: - service: - name: flyte-flyte-binary-grpc - port: - number: 8089 - - path: /flyteidl.service.AuthMetadataService/* - pathType: ImplementationSpecific - backend: - service: - name: flyte-flyte-binary-grpc - port: - number: 8089 - - path: /flyteidl.service.IdentityService - pathType: ImplementationSpecific - backend: - service: - name: flyte-flyte-binary-grpc - port: - number: 8089 - - path: /flyteidl.service.IdentityService/* - pathType: ImplementationSpecific - backend: - service: - name: flyte-flyte-binary-grpc - port: - number: 8089 - - path: /grpc.health.v1.Health - pathType: ImplementationSpecific - backend: - service: - name: flyte-flyte-binary-grpc - port: - number: 8089 - - path: /grpc.health.v1.Health/* - pathType: ImplementationSpecific - backend: - service: - name: flyte-flyte-binary-grpc - port: - number: 8089 - - path: /flyteidl.service.SignalService - pathType: ImplementationSpecific - backend: - service: - name: flyte-flyte-binary-grpc - port: - number: 8089 - - path: /flyteidl.service.SignalService/* - pathType: ImplementationSpecific - backend: - service: - name: flyte-flyte-binary-grpc - port: - number: 8089 ---- -# Source: flyte-binary/templates/ingress/http.yaml -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: flyte-flyte-binary-http - namespace: "flyte" - labels: - helm.sh/chart: flyte-binary-v0.1.10 - app.kubernetes.io/name: flyte-binary - app.kubernetes.io/instance: flyte - app.kubernetes.io/version: "1.16.0" - app.kubernetes.io/managed-by: Helm - annotations: -spec: - rules: - - http: - paths: - - backend: - service: - name: flyte-flyte-binary-http - port: - number: 8088 - path: /console - pathType: ImplementationSpecific - - backend: - service: - name: flyte-flyte-binary-http - port: - number: 8088 - path: /console/* - pathType: ImplementationSpecific - - backend: - service: - name: flyte-flyte-binary-http - port: - number: 8088 - path: /api - pathType: ImplementationSpecific - - backend: - service: - name: flyte-flyte-binary-http - port: - number: 8088 - path: /api/* - pathType: ImplementationSpecific - - backend: - service: - name: flyte-flyte-binary-http - port: - number: 8088 - path: /healthcheck - pathType: ImplementationSpecific - - backend: - service: - name: flyte-flyte-binary-http - port: - number: 8088 - path: /v1/* - pathType: ImplementationSpecific - - backend: - service: - name: flyte-flyte-binary-http - port: - number: 8088 - path: /.well-known - pathType: ImplementationSpecific - - backend: - service: - name: flyte-flyte-binary-http - port: - number: 8088 - path: /.well-known/* - pathType: ImplementationSpecific - - backend: - service: - name: flyte-flyte-binary-http - port: - number: 8088 - path: /login - pathType: ImplementationSpecific - - backend: - service: - name: flyte-flyte-binary-http - port: - number: 8088 - path: /login/* - pathType: ImplementationSpecific - - backend: - service: - name: flyte-flyte-binary-http - port: - number: 8088 - path: /logout - pathType: ImplementationSpecific - - backend: - service: - name: flyte-flyte-binary-http - port: - number: 8088 - path: /logout/* - pathType: ImplementationSpecific - - backend: - service: - name: flyte-flyte-binary-http - port: - number: 8088 - path: /callback - pathType: ImplementationSpecific - - backend: - service: - name: flyte-flyte-binary-http - port: - number: 8088 - path: /callback/* - pathType: ImplementationSpecific - - backend: - service: - name: flyte-flyte-binary-http - port: - number: 8088 - path: /me - pathType: ImplementationSpecific - - backend: - service: - name: flyte-flyte-binary-http - port: - number: 8088 - path: /config - pathType: ImplementationSpecific - - backend: - service: - name: flyte-flyte-binary-http - port: - number: 8088 - path: /config/* - pathType: ImplementationSpecific - - backend: - service: - name: flyte-flyte-binary-http - port: - number: 8088 - path: /oauth2 - pathType: ImplementationSpecific - - backend: - service: - name: flyte-flyte-binary-http - port: - number: 8088 - path: /oauth2/* - pathType: ImplementationSpecific From c393aa73f4226012a4a43a28c0083ed8fd7d5c70 Mon Sep 17 00:00:00 2001 From: Ryan Lo Date: Sun, 25 Feb 2024 17:48:14 +0800 Subject: [PATCH 04/10] separate service Signed-off-by: Ryan Lo --- charts/flyte-binary/templates/_helpers.tpl | 90 ------------------- .../flyte-binary/templates/ingress/grpc.yaml | 17 +++- .../flyte-binary/templates/ingress/http.yaml | 17 +++- .../flyte-binary/templates/service/grpc.yaml | 2 + .../flyte-binary/templates/service/http.yaml | 10 +++ charts/flyte-binary/values.yaml | 16 +++- 6 files changed, 59 insertions(+), 93 deletions(-) diff --git a/charts/flyte-binary/templates/_helpers.tpl b/charts/flyte-binary/templates/_helpers.tpl index 2b703923aa..92e8fa4636 100644 --- a/charts/flyte-binary/templates/_helpers.tpl +++ b/charts/flyte-binary/templates/_helpers.tpl @@ -176,96 +176,6 @@ Get the Flyte service GRPC port. {{- default 8089 .Values.service.ports.grpc -}} {{- end -}} -{{/* -Get the Flyte ingress GRPC paths -*/}} -{{- define "flyte-binary.ingress.grpc.paths" -}} -- path: /flyteidl.service.AdminService - pathType: ImplementationSpecific - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} -- path: /flyteidl.service.AdminService/* - pathType: ImplementationSpecific - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} -- path: /flyteidl.service.DataProxyService - pathType: ImplementationSpecific - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} -- path: /flyteidl.service.DataProxyService/* - pathType: ImplementationSpecific - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} -- path: /flyteidl.service.AuthMetadataService - pathType: ImplementationSpecific - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} -- path: /flyteidl.service.AuthMetadataService/* - pathType: ImplementationSpecific - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} -- path: /flyteidl.service.IdentityService - pathType: ImplementationSpecific - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} -- path: /flyteidl.service.IdentityService/* - pathType: ImplementationSpecific - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} -- path: /grpc.health.v1.Health - pathType: ImplementationSpecific - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} -- path: /grpc.health.v1.Health/* - pathType: ImplementationSpecific - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} -- path: /flyteidl.service.SignalService - pathType: ImplementationSpecific - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} -- path: /flyteidl.service.SignalService/* - pathType: ImplementationSpecific - backend: - service: - name: {{ include "flyte-binary.service.grpc.name" . }} - port: - number: {{ include "flyte-binary.service.grpc.port" . }} -{{- end -}} - {{/* Get the Flyte agent service GRPC port. */}} diff --git a/charts/flyte-binary/templates/ingress/grpc.yaml b/charts/flyte-binary/templates/ingress/grpc.yaml index 5a42b9958c..e41a5cc95c 100644 --- a/charts/flyte-binary/templates/ingress/grpc.yaml +++ b/charts/flyte-binary/templates/ingress/grpc.yaml @@ -38,7 +38,22 @@ spec: {{- if .Values.ingress.grpcExtraPaths.prepend }} {{- tpl ( .Values.ingress.grpcExtraPaths.prepend | toYaml ) . | nindent 6 }} {{- end }} - {{- include "flyte-binary.ingress.grpc.paths" . | nindent 6 }} + {{- range .Values.ingress.grpcPaths }} + - path: {{ . }} + {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }} + pathType: ImplementationSpecific + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ include "flyte-binary.service.grpc.name" $ }} + port: + number: {{ include "flyte-binary.service.grpc.port" $ }} + {{- else }} + serviceName: {{ include "flyte-binary.service.grpc.name" $ }} + servicePort: {{ include "flyte-binary.service.grpc.port" $ }} + {{- end }} + {{- end }} {{- if .Values.ingress.grpcExtraPaths.append }} {{- tpl ( .Values.ingress.grpcExtraPaths.append | toYaml ) . | nindent 6 }} {{- end }} diff --git a/charts/flyte-binary/templates/ingress/http.yaml b/charts/flyte-binary/templates/ingress/http.yaml index 55ebbfb9a2..e74da34d01 100644 --- a/charts/flyte-binary/templates/ingress/http.yaml +++ b/charts/flyte-binary/templates/ingress/http.yaml @@ -175,7 +175,22 @@ spec: path: /oauth2/* pathType: ImplementationSpecific {{- if not .Values.ingress.separateGrpcIngress }} - {{- include "flyte-binary.ingress.grpc.paths" . | nindent 6 }} + {{- range .Values.ingress.grpcPaths }} + - backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ include "flyte-binary.service.http.name" $ }} + port: + number: {{ include "flyte-binary.service.grpc.port" $ }} + {{- else }} + serviceName: {{ include "flyte-binary.service.http.name" $ }} + servicePort: {{ include "flyte-binary.service.grpc.port" $ }} + {{- end }} + path: {{ . }} + {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }} + pathType: ImplementationSpecific + {{- end }} + {{- end }} {{- end }} {{- if .Values.ingress.httpExtraPaths.append }} {{- tpl ( .Values.ingress.httpExtraPaths.append | toYaml ) . | nindent 6 }} diff --git a/charts/flyte-binary/templates/service/grpc.yaml b/charts/flyte-binary/templates/service/grpc.yaml index eb8d3d0063..1feafa1c5c 100644 --- a/charts/flyte-binary/templates/service/grpc.yaml +++ b/charts/flyte-binary/templates/service/grpc.yaml @@ -1,3 +1,4 @@ +{{- if .Values.ingress.separateGrpcIngress }} apiVersion: v1 kind: Service metadata: @@ -47,3 +48,4 @@ spec: nodePort: null {{- end }} selector: {{- include "flyte-binary.selectorLabels" . | nindent 4 }} +{{- end }} diff --git a/charts/flyte-binary/templates/service/http.yaml b/charts/flyte-binary/templates/service/http.yaml index 189ea1e040..3b47e72340 100644 --- a/charts/flyte-binary/templates/service/http.yaml +++ b/charts/flyte-binary/templates/service/http.yaml @@ -46,6 +46,16 @@ spec: {{- else if eq .Values.service.type "ClusterIP" }} nodePort: null {{- end }} + {{- if not .Values.ingress.separateGrpcIngress }} + - name: grpc + port: {{ include "flyte-binary.service.grpc.port" . }} + targetPort: grpc + {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.grpc)) }} + nodePort: {{ .Values.service.nodePorts.grpc }} + {{- else if eq .Values.service.type "ClusterIP" }} + nodePort: null + {{- end }} + {{- end }} {{- if .Values.service.extraPorts }} {{- tpl ( .Values.service.extraPorts | toYaml ) . | nindent 4 }} {{- end }} diff --git a/charts/flyte-binary/values.yaml b/charts/flyte-binary/values.yaml index 038553cfae..4de691d559 100644 --- a/charts/flyte-binary/values.yaml +++ b/charts/flyte-binary/values.yaml @@ -330,7 +330,7 @@ ingress: # host Hostname to bind to ingress resources host: "" # separateGrpcIngress Create a separate ingress resource for GRPC if true. Required for certain ingress controllers like nginx. - separateGrpcIngress: true + separateGrpcIngress: false # commonAnnotations Add common annotations to all ingress resources commonAnnotations: {} # httpAnnotations Add annotations to http ingress resource @@ -349,6 +349,20 @@ ingress: httpTls: [] # grpcTls Add TLS configuration to grpc ingress resource. Overrides `tls` grpcTls: [] + # grpcPaths Add default paths to grpc ingress rule + grpcPaths: + - /flyteidl.service.AdminService + - /flyteidl.service.AdminService/* + - /flyteidl.service.DataProxyService + - /flyteidl.service.DataProxyService/* + - /flyteidl.service.AuthMetadataService + - /flyteidl.service.AuthMetadataService/* + - /flyteidl.service.IdentityService + - /flyteidl.service.IdentityService/* + - /grpc.health.v1.Health + - /grpc.health.v1.Health/* + - /flyteidl.service.SignalService + - /flyteidl.service.SignalService/* # httpExtraPaths Add extra paths to http ingress rule httpExtraPaths: prepend: [] From 7150efb193ebbedd2306eac6f1c4f674db15eb55 Mon Sep 17 00:00:00 2001 From: Ryan Lo Date: Sun, 25 Feb 2024 17:56:08 +0800 Subject: [PATCH 05/10] make helm Signed-off-by: Ryan Lo --- .../flyte_sandbox_binary_helm_generated.yaml | 29 +++---------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml b/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml index a8c637e0a3..46ef7872c5 100644 --- a/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml +++ b/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml @@ -255,31 +255,6 @@ subjects: name: flyte-flyte-binary namespace: "flyte" --- -# Source: flyte-binary/templates/service/grpc.yaml -apiVersion: v1 -kind: Service -metadata: - name: flyte-flyte-binary-grpc - namespace: "flyte" - labels: - helm.sh/chart: flyte-binary-v0.1.10 - app.kubernetes.io/name: flyte-binary - app.kubernetes.io/instance: flyte - app.kubernetes.io/version: "1.16.0" - app.kubernetes.io/managed-by: Helm - annotations: -spec: - type: ClusterIP - ports: - - name: grpc - port: 8089 - targetPort: grpc - nodePort: null - selector: - app.kubernetes.io/name: flyte-binary - app.kubernetes.io/instance: flyte - app.kubernetes.io/component: flyte-binary ---- # Source: flyte-binary/templates/service/http.yaml apiVersion: v1 kind: Service @@ -300,6 +275,10 @@ spec: port: 8088 targetPort: http nodePort: null + - name: grpc + port: 8089 + targetPort: grpc + nodePort: null selector: app.kubernetes.io/name: flyte-binary app.kubernetes.io/instance: flyte From c8402d0c2afcce1ac52191b83ff04a085840d14a Mon Sep 17 00:00:00 2001 From: Ryan Lo Date: Sun, 25 Feb 2024 18:00:55 +0800 Subject: [PATCH 06/10] update README.md Signed-off-by: Ryan Lo --- charts/flyte-binary/README.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/charts/flyte-binary/README.md b/charts/flyte-binary/README.md index d9b0cbbb11..8f855666f6 100644 --- a/charts/flyte-binary/README.md +++ b/charts/flyte-binary/README.md @@ -129,6 +129,18 @@ Chart for basic single Flyte executable deployment | ingress.grpcExtraPaths.append | list | `[]` | | | ingress.grpcExtraPaths.prepend | list | `[]` | | | ingress.grpcIngressClassName | string | `""` | | +| ingress.grpcPaths[0] | string | `"/flyteidl.service.AdminService"` | | +| ingress.grpcPaths[10] | string | `"/flyteidl.service.SignalService"` | | +| ingress.grpcPaths[11] | string | `"/flyteidl.service.SignalService/*"` | | +| ingress.grpcPaths[1] | string | `"/flyteidl.service.AdminService/*"` | | +| ingress.grpcPaths[2] | string | `"/flyteidl.service.DataProxyService"` | | +| ingress.grpcPaths[3] | string | `"/flyteidl.service.DataProxyService/*"` | | +| ingress.grpcPaths[4] | string | `"/flyteidl.service.AuthMetadataService"` | | +| ingress.grpcPaths[5] | string | `"/flyteidl.service.AuthMetadataService/*"` | | +| ingress.grpcPaths[6] | string | `"/flyteidl.service.IdentityService"` | | +| ingress.grpcPaths[7] | string | `"/flyteidl.service.IdentityService/*"` | | +| ingress.grpcPaths[8] | string | `"/grpc.health.v1.Health"` | | +| ingress.grpcPaths[9] | string | `"/grpc.health.v1.Health/*"` | | | ingress.grpcTls | list | `[]` | | | ingress.host | string | `""` | | | ingress.httpAnnotations | object | `{}` | | @@ -138,7 +150,7 @@ Chart for basic single Flyte executable deployment | ingress.httpTls | list | `[]` | | | ingress.ingressClassName | string | `""` | | | ingress.labels | object | `{}` | | -| ingress.separateGrpcIngress | bool | `true` | | +| ingress.separateGrpcIngress | bool | `false` | | | ingress.tls | list | `[]` | | | nameOverride | string | `""` | | | rbac.annotations | object | `{}` | | @@ -165,3 +177,5 @@ Chart for basic single Flyte executable deployment | serviceAccount.labels | object | `{}` | | | serviceAccount.name | string | `""` | | +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) From 7428c83996a8c836753c9e6deca47e8f4c495027 Mon Sep 17 00:00:00 2001 From: Ryan Lo Date: Sun, 25 Feb 2024 23:00:12 +0800 Subject: [PATCH 07/10] move paths in values.yaml to _helpers.tpl Signed-off-by: Ryan Lo --- charts/flyte-binary/README.md | 12 ------------ charts/flyte-binary/templates/_helpers.tpl | 18 ++++++++++++++++++ .../flyte-binary/templates/ingress/grpc.yaml | 9 +++++---- .../flyte-binary/templates/ingress/http.yaml | 13 +++++++------ charts/flyte-binary/values.yaml | 14 -------------- 5 files changed, 30 insertions(+), 36 deletions(-) diff --git a/charts/flyte-binary/README.md b/charts/flyte-binary/README.md index 8f855666f6..679f115471 100644 --- a/charts/flyte-binary/README.md +++ b/charts/flyte-binary/README.md @@ -129,18 +129,6 @@ Chart for basic single Flyte executable deployment | ingress.grpcExtraPaths.append | list | `[]` | | | ingress.grpcExtraPaths.prepend | list | `[]` | | | ingress.grpcIngressClassName | string | `""` | | -| ingress.grpcPaths[0] | string | `"/flyteidl.service.AdminService"` | | -| ingress.grpcPaths[10] | string | `"/flyteidl.service.SignalService"` | | -| ingress.grpcPaths[11] | string | `"/flyteidl.service.SignalService/*"` | | -| ingress.grpcPaths[1] | string | `"/flyteidl.service.AdminService/*"` | | -| ingress.grpcPaths[2] | string | `"/flyteidl.service.DataProxyService"` | | -| ingress.grpcPaths[3] | string | `"/flyteidl.service.DataProxyService/*"` | | -| ingress.grpcPaths[4] | string | `"/flyteidl.service.AuthMetadataService"` | | -| ingress.grpcPaths[5] | string | `"/flyteidl.service.AuthMetadataService/*"` | | -| ingress.grpcPaths[6] | string | `"/flyteidl.service.IdentityService"` | | -| ingress.grpcPaths[7] | string | `"/flyteidl.service.IdentityService/*"` | | -| ingress.grpcPaths[8] | string | `"/grpc.health.v1.Health"` | | -| ingress.grpcPaths[9] | string | `"/grpc.health.v1.Health/*"` | | | ingress.grpcTls | list | `[]` | | | ingress.host | string | `""` | | | ingress.httpAnnotations | object | `{}` | | diff --git a/charts/flyte-binary/templates/_helpers.tpl b/charts/flyte-binary/templates/_helpers.tpl index 92e8fa4636..85184a45db 100644 --- a/charts/flyte-binary/templates/_helpers.tpl +++ b/charts/flyte-binary/templates/_helpers.tpl @@ -176,6 +176,24 @@ Get the Flyte service GRPC port. {{- default 8089 .Values.service.ports.grpc -}} {{- end -}} +{{/* +Get the Flyte service GRPC paths. +*/}} +{{- define "flyte-binary.ingress.grpcPaths" -}} +- /flyteidl.service.AdminService +- /flyteidl.service.AdminService/* +- /flyteidl.service.AuthMetadataService +- /flyteidl.service.AuthMetadataService/ +- /flyteidl.service.DataProxyService +- /flyteidl.service.DataProxyService/* +- /flyteidl.service.IdentityService +- /flyteidl.service.IdentityService/* +- /flyteidl.service.SignalService +- /flyteidl.service.SignalService/* +- /grpc.health.v1.Health +- /grpc.health.v1.Health/* +{{- end -}} + {{/* Get the Flyte agent service GRPC port. */}} diff --git a/charts/flyte-binary/templates/ingress/grpc.yaml b/charts/flyte-binary/templates/ingress/grpc.yaml index e41a5cc95c..bd43185e50 100644 --- a/charts/flyte-binary/templates/ingress/grpc.yaml +++ b/charts/flyte-binary/templates/ingress/grpc.yaml @@ -1,4 +1,5 @@ {{- if and .Values.ingress.create .Values.ingress.separateGrpcIngress }} +{{- $paths := (include "flyte-binary.ingress.grpcPaths" .) | fromYamlArray }} apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -38,8 +39,8 @@ spec: {{- if .Values.ingress.grpcExtraPaths.prepend }} {{- tpl ( .Values.ingress.grpcExtraPaths.prepend | toYaml ) . | nindent 6 }} {{- end }} - {{- range .Values.ingress.grpcPaths }} - - path: {{ . }} + {{- range $path := $paths }} + - path: {{ $path }} {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }} pathType: ImplementationSpecific {{- end }} @@ -50,8 +51,8 @@ spec: port: number: {{ include "flyte-binary.service.grpc.port" $ }} {{- else }} - serviceName: {{ include "flyte-binary.service.grpc.name" $ }} - servicePort: {{ include "flyte-binary.service.grpc.port" $ }} + serviceName: {{ include "flyte-binary.service.grpc.name" $ }} + servicePort: {{ include "flyte-binary.service.grpc.port" $ }} {{- end }} {{- end }} {{- if .Values.ingress.grpcExtraPaths.append }} diff --git a/charts/flyte-binary/templates/ingress/http.yaml b/charts/flyte-binary/templates/ingress/http.yaml index e74da34d01..c880350334 100644 --- a/charts/flyte-binary/templates/ingress/http.yaml +++ b/charts/flyte-binary/templates/ingress/http.yaml @@ -175,8 +175,13 @@ spec: path: /oauth2/* pathType: ImplementationSpecific {{- if not .Values.ingress.separateGrpcIngress }} - {{- range .Values.ingress.grpcPaths }} - - backend: + {{- $paths := (include "flyte-binary.ingress.grpcPaths" .) | fromYamlArray }} + {{- range $path := $paths }} + - path: {{ $path }} + {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }} + pathType: ImplementationSpecific + {{- end }} + backend: {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ include "flyte-binary.service.http.name" $ }} @@ -186,10 +191,6 @@ spec: serviceName: {{ include "flyte-binary.service.http.name" $ }} servicePort: {{ include "flyte-binary.service.grpc.port" $ }} {{- end }} - path: {{ . }} - {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }} - pathType: ImplementationSpecific - {{- end }} {{- end }} {{- end }} {{- if .Values.ingress.httpExtraPaths.append }} diff --git a/charts/flyte-binary/values.yaml b/charts/flyte-binary/values.yaml index 4de691d559..2935c98db9 100644 --- a/charts/flyte-binary/values.yaml +++ b/charts/flyte-binary/values.yaml @@ -349,20 +349,6 @@ ingress: httpTls: [] # grpcTls Add TLS configuration to grpc ingress resource. Overrides `tls` grpcTls: [] - # grpcPaths Add default paths to grpc ingress rule - grpcPaths: - - /flyteidl.service.AdminService - - /flyteidl.service.AdminService/* - - /flyteidl.service.DataProxyService - - /flyteidl.service.DataProxyService/* - - /flyteidl.service.AuthMetadataService - - /flyteidl.service.AuthMetadataService/* - - /flyteidl.service.IdentityService - - /flyteidl.service.IdentityService/* - - /grpc.health.v1.Health - - /grpc.health.v1.Health/* - - /flyteidl.service.SignalService - - /flyteidl.service.SignalService/* # httpExtraPaths Add extra paths to http ingress rule httpExtraPaths: prepend: [] From 1c919567ee27107296d17ff789b8d676cb33dae9 Mon Sep 17 00:00:00 2001 From: Ryan Lo Date: Sun, 25 Feb 2024 23:52:28 +0800 Subject: [PATCH 08/10] remove anno Signed-off-by: Ryan Lo --- charts/flyte-binary/templates/ingress/http.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/charts/flyte-binary/templates/ingress/http.yaml b/charts/flyte-binary/templates/ingress/http.yaml index c880350334..cdce87047b 100644 --- a/charts/flyte-binary/templates/ingress/http.yaml +++ b/charts/flyte-binary/templates/ingress/http.yaml @@ -21,9 +21,6 @@ metadata: {{- if .Values.ingress.httpAnnotations }} {{- tpl ( .Values.ingress.httpAnnotations | toYaml ) . | nindent 4 }} {{- end }} - {{- if not .Values.ingress.separateGrpcIngress }} - nginx.ingress.kubernetes.io/backend-protocol: "GRPC" - {{- end }} spec: {{- if .Values.ingress.httpIngressClassName }} ingressClassName: {{ .Values.ingress.httpIngressClassName | quote }} From 95ef45af747162b7ad732d100fd431cb010c5022 Mon Sep 17 00:00:00 2001 From: Ryan Lo Date: Mon, 4 Mar 2024 19:34:56 +0800 Subject: [PATCH 09/10] fix doc Signed-off-by: Ryan Lo --- charts/flyte-binary/README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/charts/flyte-binary/README.md b/charts/flyte-binary/README.md index 679f115471..b8c66f9392 100644 --- a/charts/flyte-binary/README.md +++ b/charts/flyte-binary/README.md @@ -165,5 +165,3 @@ Chart for basic single Flyte executable deployment | serviceAccount.labels | object | `{}` | | | serviceAccount.name | string | `""` | | ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) From 73c37d23250205996a7c7827f65ecaabcb1dbca9 Mon Sep 17 00:00:00 2001 From: Ryan Lo Date: Mon, 4 Mar 2024 19:45:35 +0800 Subject: [PATCH 10/10] set ingress.separateGrpcIngress true by default Signed-off-by: Ryan Lo --- charts/flyte-binary/README.md | 2 +- charts/flyte-binary/values.yaml | 2 +- .../flyte_sandbox_binary_helm_generated.yaml | 29 ++++++++++++++++--- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/charts/flyte-binary/README.md b/charts/flyte-binary/README.md index b8c66f9392..d9b0cbbb11 100644 --- a/charts/flyte-binary/README.md +++ b/charts/flyte-binary/README.md @@ -138,7 +138,7 @@ Chart for basic single Flyte executable deployment | ingress.httpTls | list | `[]` | | | ingress.ingressClassName | string | `""` | | | ingress.labels | object | `{}` | | -| ingress.separateGrpcIngress | bool | `false` | | +| ingress.separateGrpcIngress | bool | `true` | | | ingress.tls | list | `[]` | | | nameOverride | string | `""` | | | rbac.annotations | object | `{}` | | diff --git a/charts/flyte-binary/values.yaml b/charts/flyte-binary/values.yaml index 2935c98db9..038553cfae 100644 --- a/charts/flyte-binary/values.yaml +++ b/charts/flyte-binary/values.yaml @@ -330,7 +330,7 @@ ingress: # host Hostname to bind to ingress resources host: "" # separateGrpcIngress Create a separate ingress resource for GRPC if true. Required for certain ingress controllers like nginx. - separateGrpcIngress: false + separateGrpcIngress: true # commonAnnotations Add common annotations to all ingress resources commonAnnotations: {} # httpAnnotations Add annotations to http ingress resource diff --git a/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml b/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml index 46ef7872c5..a8c637e0a3 100644 --- a/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml +++ b/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml @@ -255,6 +255,31 @@ subjects: name: flyte-flyte-binary namespace: "flyte" --- +# Source: flyte-binary/templates/service/grpc.yaml +apiVersion: v1 +kind: Service +metadata: + name: flyte-flyte-binary-grpc + namespace: "flyte" + labels: + helm.sh/chart: flyte-binary-v0.1.10 + app.kubernetes.io/name: flyte-binary + app.kubernetes.io/instance: flyte + app.kubernetes.io/version: "1.16.0" + app.kubernetes.io/managed-by: Helm + annotations: +spec: + type: ClusterIP + ports: + - name: grpc + port: 8089 + targetPort: grpc + nodePort: null + selector: + app.kubernetes.io/name: flyte-binary + app.kubernetes.io/instance: flyte + app.kubernetes.io/component: flyte-binary +--- # Source: flyte-binary/templates/service/http.yaml apiVersion: v1 kind: Service @@ -275,10 +300,6 @@ spec: port: 8088 targetPort: http nodePort: null - - name: grpc - port: 8089 - targetPort: grpc - nodePort: null selector: app.kubernetes.io/name: flyte-binary app.kubernetes.io/instance: flyte