Update ingress and proxy for SignalService (#3151)

Signed-off-by: Yee Hing Tong <wild-endeavor@users.noreply.github.com>
flyteorg · Dec 27, 2022 · 187a857 · 187a857
1 parent b44d0bb
commit 187a857
Show file tree

Hide file tree

Showing 18 changed files with 201 additions and 4 deletions.
diff --git a/charts/flyte-binary/templates/ingress/grpc.yaml b/charts/flyte-binary/templates/ingress/grpc.yaml
@@ -95,6 +95,20 @@ spec:
               number: {{ include "flyte-binary.service.grpcPort" . }}
         path: /grpc.health.v1.Health/*
         pathType: ImplementationSpecific
+      - backend:
+          service:
+            name: {{ include "flyte-binary.fullname" . }}
+            port:
+              number: {{ include "flyte-binary.service.grpcPort" . }}
+        path: /flyteidl.service.SignalService
+        pathType: ImplementationSpecific
+      - backend:
+          service:
+            name: {{ include "flyte-binary.fullname" . }}
+            port:
+              number: {{ include "flyte-binary.service.grpcPort" . }}
+        path: /flyteidl.service.SignalService/*
+        pathType: ImplementationSpecific
     {{- if .Values.ingress.host }}
     host: {{ tpl .Values.ingress.host . | quote }}
     {{- end }}

diff --git a/charts/flyte-core/templates/common/ingress.yaml b/charts/flyte-core/templates/common/ingress.yaml
@@ -1,5 +1,29 @@
 {{- define "grpcRoutes" -}}
 # NOTE: Port 81 in flyteadmin is the GRPC server port for FlyteAdmin.
+- path: /flyteidl.service.SignalService
+  pathType: ImplementationSpecific
+  backend:
+{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
+    service:
+      name: flyteadmin
+      port:
+        number: 81
+{{- else }}
+    serviceName: flyteadmin
+    servicePort: 81
+{{- end }}
+- path: /flyteidl.service.SignalService/*
+  pathType: ImplementationSpecific
+  backend:
+{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
+    service:
+      name: flyteadmin
+      port:
+        number: 81
+{{- else }}
+    serviceName: flyteadmin
+    servicePort: 81
+{{- end }}
 - path: /flyteidl.service.AdminService
   pathType: ImplementationSpecific
   backend:

diff --git a/charts/flyte-sandbox/templates/proxy/configmap.yaml b/charts/flyte-sandbox/templates/proxy/configmap.yaml
@@ -101,6 +101,10 @@ data:
                                                   prefix: "/grpc.health.v1.Health"
                                               route:
                                                   cluster: flyte_grpc
+                                            - match:
+                                                  prefix: "/flyteidl.service.SignalService"
+                                              route:
+                                                  cluster: flyte_grpc
                                             {{- if index .Values "kubernetes-dashboard" "enabled" }}
                                             - match:
                                                   path: "/kubernetes-dashboard"

diff --git a/deployment/eks/flyte_aws_scheduler_helm_generated.yaml b/deployment/eks/flyte_aws_scheduler_helm_generated.yaml
@@ -1577,6 +1577,20 @@ spec:
           #   pathType: ImplementationSpecific
           #
           # NOTE: Port 81 in flyteadmin is the GRPC server port for FlyteAdmin.
+          - path: /flyteidl.service.SignalService
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: flyteadmin
+                port:
+                  number: 81
+          - path: /flyteidl.service.SignalService/*
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: flyteadmin
+                port:
+                  number: 81
           - path: /flyteidl.service.AdminService
             pathType: ImplementationSpecific
             backend:

diff --git a/deployment/eks/flyte_generated.yaml b/deployment/eks/flyte_generated.yaml
@@ -9496,6 +9496,13 @@ spec:
   rules:
   - http:
       paths:
+      - backend:
+          service:
+            name: flyteadmin
+            port:
+              number: 81
+        path: /flyteidl.service.SignalService/*
+        pathType: ImplementationSpecific
       - backend:
           service:
             name: flyteadmin

diff --git a/deployment/eks/flyte_helm_controlplane_generated.yaml b/deployment/eks/flyte_helm_controlplane_generated.yaml
@@ -1205,6 +1205,20 @@ spec:
           #   pathType: ImplementationSpecific
           #
           # NOTE: Port 81 in flyteadmin is the GRPC server port for FlyteAdmin.
+          - path: /flyteidl.service.SignalService
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: flyteadmin
+                port:
+                  number: 81
+          - path: /flyteidl.service.SignalService/*
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: flyteadmin
+                port:
+                  number: 81
           - path: /flyteidl.service.AdminService
             pathType: ImplementationSpecific
             backend:

diff --git a/deployment/eks/flyte_helm_dataplane_generated.yaml b/deployment/eks/flyte_helm_dataplane_generated.yaml
@@ -769,6 +769,20 @@ spec:
           #   pathType: ImplementationSpecific
           #
           # NOTE: Port 81 in flyteadmin is the GRPC server port for FlyteAdmin.
+          - path: /flyteidl.service.SignalService
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: flyteadmin
+                port:
+                  number: 81
+          - path: /flyteidl.service.SignalService/*
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: flyteadmin
+                port:
+                  number: 81
           - path: /flyteidl.service.AdminService
             pathType: ImplementationSpecific
             backend:

diff --git a/deployment/eks/flyte_helm_generated.yaml b/deployment/eks/flyte_helm_generated.yaml
@@ -1696,6 +1696,20 @@ spec:
           #   pathType: ImplementationSpecific
           #
           # NOTE: Port 81 in flyteadmin is the GRPC server port for FlyteAdmin.
+          - path: /flyteidl.service.SignalService
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: flyteadmin
+                port:
+                  number: 81
+          - path: /flyteidl.service.SignalService/*
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: flyteadmin
+                port:
+                  number: 81
           - path: /flyteidl.service.AdminService
             pathType: ImplementationSpecific
             backend:

diff --git a/deployment/gcp/flyte_generated.yaml b/deployment/gcp/flyte_generated.yaml
@@ -9404,6 +9404,13 @@ spec:
               number: 81
         path: /flyteidl.service.IdentityService
         pathType: ImplementationSpecific
+      - backend:
+          service:
+            name: flyteadmin
+            port:
+              number: 81
+        path: /flyteidl.service.SignalService
+        pathType: ImplementationSpecific
       - backend:
           service:
             name: flyteadmin

diff --git a/deployment/gcp/flyte_helm_controlplane_generated.yaml b/deployment/gcp/flyte_helm_controlplane_generated.yaml
@@ -1201,6 +1201,20 @@ spec:
         paths:
           #
           # NOTE: Port 81 in flyteadmin is the GRPC server port for FlyteAdmin.
+          - path: /flyteidl.service.SignalService
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: flyteadmin
+                port:
+                  number: 81
+          - path: /flyteidl.service.SignalService/*
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: flyteadmin
+                port:
+                  number: 81
           - path: /flyteidl.service.AdminService
             pathType: ImplementationSpecific
             backend:

diff --git a/deployment/gcp/flyte_helm_dataplane_generated.yaml b/deployment/gcp/flyte_helm_dataplane_generated.yaml
@@ -757,6 +757,20 @@ spec:
         paths:
           #
           # NOTE: Port 81 in flyteadmin is the GRPC server port for FlyteAdmin.
+          - path: /flyteidl.service.SignalService
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: flyteadmin
+                port:
+                  number: 81
+          - path: /flyteidl.service.SignalService/*
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: flyteadmin
+                port:
+                  number: 81
           - path: /flyteidl.service.AdminService
             pathType: ImplementationSpecific
             backend:

diff --git a/deployment/gcp/flyte_helm_generated.yaml b/deployment/gcp/flyte_helm_generated.yaml
@@ -1699,6 +1699,20 @@ spec:
         paths:
           #
           # NOTE: Port 81 in flyteadmin is the GRPC server port for FlyteAdmin.
+          - path: /flyteidl.service.SignalService
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: flyteadmin
+                port:
+                  number: 81
+          - path: /flyteidl.service.SignalService/*
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: flyteadmin
+                port:
+                  number: 81
           - path: /flyteidl.service.AdminService
             pathType: ImplementationSpecific
             backend:

diff --git a/deployment/sandbox/flyte_generated.yaml b/deployment/sandbox/flyte_generated.yaml
@@ -3797,6 +3797,13 @@ spec:
               number: 81
         path: /flyteidl.service.IdentityService
         pathType: ImplementationSpecific
+      - backend:
+          service:
+            name: flyteadmin
+            port:
+              number: 81
+        path: /flyteidl.service.SignalService
+        pathType: ImplementationSpecific
       - backend:
           service:
             name: flyteadmin

diff --git a/deployment/sandbox/flyte_helm_generated.yaml b/deployment/sandbox/flyte_helm_generated.yaml
@@ -7703,6 +7703,20 @@ spec:
                 port:
                   number: 80
           # NOTE: Port 81 in flyteadmin is the GRPC server port for FlyteAdmin.
+          - path: /flyteidl.service.SignalService
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: flyteadmin
+                port:
+                  number: 81
+          - path: /flyteidl.service.SignalService/*
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: flyteadmin
+                port:
+                  number: 81
           - path: /flyteidl.service.AdminService
             pathType: ImplementationSpecific
             backend:

diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml
@@ -615,6 +615,10 @@ data:
                                                   prefix: "/grpc.health.v1.Health"
                                               route:
                                                   cluster: flyte_grpc
+                                            - match:
+                                                  prefix: "/flyteidl.service.SignalService"
+                                              route:
+                                                  cluster: flyte_grpc
                                             - match:
                                                   path: "/kubernetes-dashboard"
                                               redirect:
@@ -730,7 +734,7 @@ type: Opaque
 ---
 apiVersion: v1
 data:
-  haSharedSecret: bnB2TXJKNEpYU3BSeEIwdg==
+  haSharedSecret: a1Y4dFhBV3RabWVwWktHbw==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -1032,7 +1036,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 044987b193c168f87ad6b75510b710dae15de36461cb822559e13e6f3bf1789a
-        checksum/secret: a339f9ea69001d342fb185b1c8e71a8f2819b62395aaafd9d0afe2062fa99d3d
+        checksum/secret: e0a92f8a26dea3e73589b0a416e19579ba961f761a0675b0a6cb6bf1ebc911dd
       labels:
         app: docker-registry
         release: sandbox

diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml
@@ -404,6 +404,10 @@ data:
                                                   prefix: "/grpc.health.v1.Health"
                                               route:
                                                   cluster: flyte_grpc
+                                            - match:
+                                                  prefix: "/flyteidl.service.SignalService"
+                                              route:
+                                                  cluster: flyte_grpc
                                             - match:
                                                   path: "/kubernetes-dashboard"
                                               redirect:
@@ -519,7 +523,7 @@ type: Opaque
 ---
 apiVersion: v1
 data:
-  haSharedSecret: M1Y5UjRPQnBYc1BmM0l6ZQ==
+  haSharedSecret: MHk0bTNlcER1QnRXQXkyQw==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -759,7 +763,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 044987b193c168f87ad6b75510b710dae15de36461cb822559e13e6f3bf1789a
-        checksum/secret: c8bab0808954291df696906bd5d16875c021843407e016af50b956f1e9d50133
+        checksum/secret: 5c6d6f259b5f3066ef2fb403f0b5ddb90c007d6acdaa36d1683417f6130e2217
       labels:
         app: docker-registry
         release: sandbox

diff --git a/kustomize/base/ingress/ingress.yaml b/kustomize/base/ingress/ingress.yaml
@@ -41,6 +41,13 @@ spec:
                 name: flyteadmin
                 port:
                   number: 81
+          - path: /flyteidl.service.SignalService
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: flyteadmin
+                port:
+                  number: 81
           # Port 87 in FlyteAdmin maps to the redoc container.
           - path: /openapi
             pathType: ImplementationSpecific

diff --git a/kustomize/overlays/eks/flyte/ingress/ingress_grpc.yaml b/kustomize/overlays/eks/flyte/ingress/ingress_grpc.yaml
@@ -22,6 +22,13 @@ spec:
   rules:
     - http:
         paths:
+          - backend:
+              service:
+                name: flyteadmin
+                port:
+                  number: 81
+            path: /flyteidl.service.SignalService/*
+            pathType: ImplementationSpecific
           - backend:
               service:
                 name: flyteadmin