Add support prepending or appending paths to flyte-binary ingresses

charts/flyte-binary/README.md

@@ -91,8 +91,12 @@ Chart for basic single Flyte executable deployment
 | ingress.commonAnnotations | object | `{}` |  |
 | ingress.create | bool | `false` |  |
 | ingress.grpcAnnotations | object | `{}` |  |
+| ingress.grpcExtraPaths.append | list | `[]` |  |
+| ingress.grpcExtraPaths.prepend | list | `[]` |  |
 | ingress.host | string | `""` |  |
 | ingress.httpAnnotations | object | `{}` |  |
+| ingress.httpExtraPaths.append | list | `[]` |  |
+| ingress.httpExtraPaths.prepend | list | `[]` |  |
 | ingress.labels | object | `{}` |  |
 | nameOverride | string | `""` |  |
 | rbac.annotations | object | `{}` |  |

charts/flyte-binary/templates/ingress/grpc.yaml

@@ -25,6 +25,9 @@ spec:
   rules:
   - http:
       paths:
+      {{- if .Values.ingress.grpcExtraPaths.prepend }}
+      {{- tpl ( .Values.ingress.grpcExtraPaths.prepend | toYaml ) . | nindent 6 }}
+      {{- end }}
       - backend:
           service:
             name: {{ include "flyte-binary.fullname" . }}
@@ -109,6 +112,9 @@ spec:
               number: {{ include "flyte-binary.service.grpcPort" . }}
         path: /flyteidl.service.SignalService/*
         pathType: ImplementationSpecific
+      {{- if .Values.ingress.grpcExtraPaths.append }}
+      {{- tpl ( .Values.ingress.grpcExtraPaths.append | toYaml ) . | nindent 6 }}
+      {{- end }}
     {{- if .Values.ingress.host }}
     host: {{ tpl .Values.ingress.host . | quote }}
     {{- end }}

charts/flyte-binary/templates/ingress/http.yaml

@@ -25,6 +25,9 @@ spec:
   rules:
   - http:
       paths:
+      {{- if .Values.ingress.httpExtraPaths.prepend }}
+      {{- tpl ( .Values.ingress.httpExtraPaths.prepend | toYaml ) . | nindent 6 }}
+      {{- end }}
       - backend:
           service:
             name: {{ include "flyte-binary.fullname" . }}
@@ -158,6 +161,9 @@ spec:
               number: {{ include "flyte-binary.service.httpPort" . }}
         path: /oauth2/*
         pathType: ImplementationSpecific
+      {{- if .Values.ingress.httpExtraPaths.append }}
+      {{- tpl ( .Values.ingress.httpExtraPaths.append | toYaml ) . | nindent 6 }}
+      {{- end }}
     {{- if .Values.ingress.host }}
     host: {{ tpl .Values.ingress.host . | quote }}
     {{- end }}

charts/flyte-binary/values.yaml

@@ -242,14 +242,22 @@ ingress:
   create: false
   # labels Add labels to ingress resources
   labels: {}
+  # host Hostname to bind to ingress resources
+  host: ""
   # commonAnnotations Add common annotations to all ingress resources
   commonAnnotations: {}
   # httpAnnotations Add common annotations to http ingress resource
   httpAnnotations: {}
   # grpcAnnotations Add common annotations to grpc ingress resource
   grpcAnnotations: {}
-  # host Hostname to bind to ingress resources
-  host: ""
+  # httpExtraPaths Add extra paths to http ingress rule
+  httpExtraPaths:
+    prepend: []
+    append: []
+  # grpcExtraPaths Add extra paths to grpc ingress rule
+  grpcExtraPaths:
+    prepend: []
+    append: []
 
 # rbac Configure Kubernetes RBAC for Flyte
 rbac:

charts/flyte-sandbox/Chart.lock

@@ -15,4 +15,4 @@ dependencies:
   repository: https://charts.bitnami.com/bitnami
   version: 12.1.9
 digest: sha256:e7155e540bbdb98f690eb12e2bd301a19d8b36833336f6991410cb44d8d9bb5e
-generated: "2023-02-22T21:45:07.411055-08:00"
+generated: "2023-03-02T22:28:45.297208-08:00"

docker/sandbox-bundled/manifests/complete.yaml

@@ -758,7 +758,7 @@ type: Opaque
 ---
 apiVersion: v1
 data:
-  haSharedSecret: VnZiU0xIZjBLRVcxcjI0Zw==
+  haSharedSecret: cEd6YWhhelF6QkZhSndPYg==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -1253,7 +1253,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: 29be0ecfab0aea939a12ccb785931dedaccca4b6be7d3d38d925c4dc6487085e
+        checksum/secret: e2e92b067aed683cff9547e637af69f8c8bcb463ac2504b4149165af0cb536d1
       labels:
         app: docker-registry
         release: flyte-sandbox

docker/sandbox-bundled/manifests/dev.yaml

@@ -499,7 +499,7 @@ metadata:
 ---
 apiVersion: v1
 data:
-  haSharedSecret: dUtFcWNGbGpLSHFTSGJSMg==
+  haSharedSecret: ZlBGdHV2RExCcUQwNXgwVQ==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -875,7 +875,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: f28d4e39d03147a771f800611c0bba800259f4596e6ea82b05b238df50f427c3
+        checksum/secret: 9f6ff50ab56aeaf80aa76f5a64b6a942a7bc1ce7072a731b33b1c06fc9c25925
       labels:
         app: docker-registry
         release: flyte-sandbox