From fefabcaccf8f8a16ca1d8e3274b02e9db6f21610 Mon Sep 17 00:00:00 2001
From: Jeev B <jeevb@users.noreply.github.com>
Date: Fri, 31 Mar 2023 11:17:37 -0700
Subject: [PATCH] Point ingress to correct service

Signed-off-by: Jeev B <jeevb@users.noreply.github.com>
---
 .../flyte-binary/templates/ingress/grpc.yaml  | 24 ++++++------
 .../flyte-binary/templates/ingress/http.yaml  | 38 +++++++++----------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/charts/flyte-binary/templates/ingress/grpc.yaml b/charts/flyte-binary/templates/ingress/grpc.yaml
index 1c39757262..10701cb9e6 100644
--- a/charts/flyte-binary/templates/ingress/grpc.yaml
+++ b/charts/flyte-binary/templates/ingress/grpc.yaml
@@ -30,84 +30,84 @@ spec:
       {{- end }}
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            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.fullname" . }}
+            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.fullname" . }}
+            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.fullname" . }}
+            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.fullname" . }}
+            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.fullname" . }}
+            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.fullname" . }}
+            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.fullname" . }}
+            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.fullname" . }}
+            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.fullname" . }}
+            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.fullname" . }}
+            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.fullname" . }}
+            name: {{ include "flyte-binary.service.grpc.name" . }}
             port:
               number: {{ include "flyte-binary.service.grpc.port" . }}
         path: /flyteidl.service.SignalService/*
diff --git a/charts/flyte-binary/templates/ingress/http.yaml b/charts/flyte-binary/templates/ingress/http.yaml
index 432a77fb2a..e854849503 100644
--- a/charts/flyte-binary/templates/ingress/http.yaml
+++ b/charts/flyte-binary/templates/ingress/http.yaml
@@ -30,133 +30,133 @@ spec:
       {{- end }}
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            name: {{ include "flyte-binary.service.http.name" . }}
             port:
               number: {{ include "flyte-binary.service.http.port" . }}
         path: /console
         pathType: ImplementationSpecific
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            name: {{ include "flyte-binary.service.http.name" . }}
             port:
               number: {{ include "flyte-binary.service.http.port" . }}
         path: /console/*
         pathType: ImplementationSpecific
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            name: {{ include "flyte-binary.service.http.name" . }}
             port:
               number: {{ include "flyte-binary.service.http.port" . }}
         path: /api
         pathType: ImplementationSpecific
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            name: {{ include "flyte-binary.service.http.name" . }}
             port:
               number: {{ include "flyte-binary.service.http.port" . }}
         path: /api/*
         pathType: ImplementationSpecific
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            name: {{ include "flyte-binary.service.http.name" . }}
             port:
               number: {{ include "flyte-binary.service.http.port" . }}
         path: /healthcheck
         pathType: ImplementationSpecific
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            name: {{ include "flyte-binary.service.http.name" . }}
             port:
               number: {{ include "flyte-binary.service.http.port" . }}
         path: /v1/*
         pathType: ImplementationSpecific
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            name: {{ include "flyte-binary.service.http.name" . }}
             port:
               number: {{ include "flyte-binary.service.http.port" . }}
         path: /.well-known
         pathType: ImplementationSpecific
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            name: {{ include "flyte-binary.service.http.name" . }}
             port:
               number: {{ include "flyte-binary.service.http.port" . }}
         path: /.well-known/*
         pathType: ImplementationSpecific
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            name: {{ include "flyte-binary.service.http.name" . }}
             port:
               number: {{ include "flyte-binary.service.http.port" . }}
         path: /login
         pathType: ImplementationSpecific
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            name: {{ include "flyte-binary.service.http.name" . }}
             port:
               number: {{ include "flyte-binary.service.http.port" . }}
         path: /login/*
         pathType: ImplementationSpecific
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            name: {{ include "flyte-binary.service.http.name" . }}
             port:
               number: {{ include "flyte-binary.service.http.port" . }}
         path: /logout
         pathType: ImplementationSpecific
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            name: {{ include "flyte-binary.service.http.name" . }}
             port:
               number: {{ include "flyte-binary.service.http.port" . }}
         path: /logout/*
         pathType: ImplementationSpecific
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            name: {{ include "flyte-binary.service.http.name" . }}
             port:
               number: {{ include "flyte-binary.service.http.port" . }}
         path: /callback
         pathType: ImplementationSpecific
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            name: {{ include "flyte-binary.service.http.name" . }}
             port:
               number: {{ include "flyte-binary.service.http.port" . }}
         path: /callback/*
         pathType: ImplementationSpecific
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            name: {{ include "flyte-binary.service.http.name" . }}
             port:
               number: {{ include "flyte-binary.service.http.port" . }}
         path: /me
         pathType: ImplementationSpecific
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            name: {{ include "flyte-binary.service.http.name" . }}
             port:
               number: {{ include "flyte-binary.service.http.port" . }}
         path: /config
         pathType: ImplementationSpecific
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            name: {{ include "flyte-binary.service.http.name" . }}
             port:
               number: {{ include "flyte-binary.service.http.port" . }}
         path: /config/*
         pathType: ImplementationSpecific
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            name: {{ include "flyte-binary.service.http.name" . }}
             port:
               number: {{ include "flyte-binary.service.http.port" . }}
         path: /oauth2
         pathType: ImplementationSpecific
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            name: {{ include "flyte-binary.service.http.name" . }}
             port:
               number: {{ include "flyte-binary.service.http.port" . }}
         path: /oauth2/*