Add support prepending or appending paths to flyte-binary ingresses (f…

…lyteorg#3394) Signed-off-by: Jeev B <[email protected]>
MemVerge · Mar 4, 2023 · ba423f6 · ba423f6
1 parent 5016298
commit ba423f6
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 7 deletions.
diff --git a/charts/flyte-binary/README.md b/charts/flyte-binary/README.md
@@ -89,8 +89,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 | `{}` |  |

diff --git a/charts/flyte-binary/templates/ingress/grpc.yaml b/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 }}

diff --git a/charts/flyte-binary/templates/ingress/http.yaml b/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 }}

diff --git a/charts/flyte-binary/values.yaml b/charts/flyte-binary/values.yaml
@@ -243,14 +243,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:

diff --git a/charts/flyte-sandbox/Chart.lock b/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-03-02T20:34:57.944033-08:00"
+generated: "2023-03-03T18:37:30.405698-08:00"
diff --git a/charts/flyte-sandbox/charts/flyte-binary-v0.1.10.tgz b/charts/flyte-sandbox/charts/flyte-binary-v0.1.10.tgz
diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml
@@ -758,7 +758,7 @@ type: Opaque
 ---
 apiVersion: v1
 data:
-  haSharedSecret: YnFuQzZJbUdEQVo3VkhsaQ==
+  haSharedSecret: UVZmZkJkU3BERDNNcXRjWQ==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -1243,7 +1243,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: 2b44bc8183b23be063b704a6a4d7f9f461a0e654d1cb76da460863e0bbc8039e
+        checksum/secret: 85b387bc793cdb8978dcd891da651b518c32b0c0e9da50e37439ad6b8bf6391a
       labels:
         app: docker-registry
         release: flyte-sandbox

diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml
@@ -499,7 +499,7 @@ metadata:
 ---
 apiVersion: v1
 data:
-  haSharedSecret: amxUMEdxOEc4b1BxOXJaWA==
+  haSharedSecret: UkZYMFlqa0dkVnJoWkRORg==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -875,7 +875,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: b4b5f7919db1599f4f85df75e4d79b8953446ed40bbdc2b10d8997584e18f687
+        checksum/secret: ad07ea08c33430878a7e449656eaed8895813d69937dd1bc4c3567ed5c6b8da0
       labels:
         app: docker-registry
         release: flyte-sandbox