From ee90abe83fc0c5c0a37e1d0dc8659e16f2b5ecaa Mon Sep 17 00:00:00 2001
From: Jeev B <jeevb@users.noreply.github.com>
Date: Fri, 31 Mar 2023 11:38:52 -0700
Subject: [PATCH] Split flyte-binary services into http and grpc, and some
 cleanups (#3518)

* Split flyte-binary services into http and grpc, and some cleanups

Signed-off-by: Jeev B <jeevb@users.noreply.github.com>

* Point ingress to correct service

Signed-off-by: Jeev B <jeevb@users.noreply.github.com>

---------

Signed-off-by: Jeev B <jeevb@users.noreply.github.com>
---
 charts/flyte-binary/README.md                 |  4 +-
 charts/flyte-binary/templates/_helpers.tpl    | 18 ++++-
 charts/flyte-binary/templates/configmap.yaml  |  8 +-
 .../flyte-binary/templates/ingress/grpc.yaml  | 48 ++++++------
 .../flyte-binary/templates/ingress/http.yaml  | 76 +++++++++----------
 .../flyte-binary/templates/service/grpc.yaml  | 49 ++++++++++++
 .../service/{main.yaml => http.yaml}          | 18 ++---
 .../templates/service/webhook.yaml            |  3 +
 charts/flyte-binary/values.yaml               | 12 ++-
 charts/flyte-sandbox/Chart.lock               |  2 +-
 .../templates/proxy/configmap.yaml            |  4 +-
 .../flyte_sandbox_binary_helm_generated.yaml  | 32 ++++++--
 .../sandbox-bundled/manifests/complete.yaml   | 62 +++++++++------
 docker/sandbox-bundled/manifests/dev.yaml     |  4 +-
 14 files changed, 224 insertions(+), 116 deletions(-)
 create mode 100644 charts/flyte-binary/templates/service/grpc.yaml
 rename charts/flyte-binary/templates/service/{main.yaml => http.yaml} (79%)

diff --git a/charts/flyte-binary/README.md b/charts/flyte-binary/README.md
index 4955ed2233..d04bed0f6d 100644
--- a/charts/flyte-binary/README.md
+++ b/charts/flyte-binary/README.md
@@ -109,10 +109,12 @@ Chart for basic single Flyte executable deployment
 | rbac.create | bool | `true` |  |
 | rbac.extraRules | list | `[]` |  |
 | rbac.labels | object | `{}` |  |
-| service.annotations | object | `{}` |  |
 | service.clusterIP | string | `""` |  |
+| service.commonAnnotations | object | `{}` |  |
 | service.externalTrafficPolicy | string | `"Cluster"` |  |
 | service.extraPorts | list | `[]` |  |
+| service.grpcAnnotations | object | `{}` |  |
+| service.httpAnnotations | object | `{}` |  |
 | service.labels | object | `{}` |  |
 | service.loadBalancerIP | string | `""` |  |
 | service.loadBalancerSourceRanges | list | `[]` |  |
diff --git a/charts/flyte-binary/templates/_helpers.tpl b/charts/flyte-binary/templates/_helpers.tpl
index 2ddcaf6911..44ae43f8c3 100644
--- a/charts/flyte-binary/templates/_helpers.tpl
+++ b/charts/flyte-binary/templates/_helpers.tpl
@@ -138,17 +138,31 @@ Get the Flyte cluster resource templates ConfigMap name.
 {{- printf "%s-cluster-resource-templates" (include "flyte-binary.fullname" .) -}}
 {{- end -}}
 
+{{/*
+Get the Flyte HTTP service name
+*/}}
+{{- define "flyte-binary.service.http.name" -}}
+{{- printf "%s-http" (include "flyte-binary.fullname" .) -}}
+{{- end -}}
+
+{{/*
+Get the Flyte GRPC service name
+*/}}
+{{- define "flyte-binary.service.grpc.name" -}}
+{{- printf "%s-grpc" (include "flyte-binary.fullname" .) -}}
+{{- end -}}
+
 {{/*
 Get the Flyte service HTTP port.
 */}}
-{{- define "flyte-binary.service.httpPort" -}}
+{{- define "flyte-binary.service.http.port" -}}
 {{- default 8088 .Values.service.ports.http -}}
 {{- end -}}
 
 {{/*
 Get the Flyte service GRPC port.
 */}}
-{{- define "flyte-binary.service.grpcPort" -}}
+{{- define "flyte-binary.service.grpc.port" -}}
 {{- default 8089 .Values.service.ports.grpc -}}
 {{- end -}}
 
diff --git a/charts/flyte-binary/templates/configmap.yaml b/charts/flyte-binary/templates/configmap.yaml
index d8b17d48c4..06cdbc700a 100644
--- a/charts/flyte-binary/templates/configmap.yaml
+++ b/charts/flyte-binary/templates/configmap.yaml
@@ -175,10 +175,10 @@ data:
       {{- if .Values.configuration.auth.authorizedUris }}
       {{- tpl ( .Values.configuration.auth.authorizedUris | toYaml ) . | nindent 6 }}
       {{- end }}
-      - http://{{ include "flyte-binary.fullname" . }}:{{ include "flyte-binary.service.httpPort" . }}
-      - http://{{ include "flyte-binary.fullname" . }}.{{ .Release.Namespace }}:{{ include "flyte-binary.service.httpPort" . }}
-      - http://{{ include "flyte-binary.fullname" . }}.{{ .Release.Namespace }}.svc:{{ include "flyte-binary.service.httpPort" . }}
-      - http://{{ include "flyte-binary.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ include "flyte-binary.service.httpPort" . }}
+      - http://{{ include "flyte-binary.fullname" . }}:{{ include "flyte-binary.service.http.port" . }}
+      - http://{{ include "flyte-binary.fullname" . }}.{{ .Release.Namespace }}:{{ include "flyte-binary.service.http.port" . }}
+      - http://{{ include "flyte-binary.fullname" . }}.{{ .Release.Namespace }}.svc:{{ include "flyte-binary.service.http.port" . }}
+      - http://{{ include "flyte-binary.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ include "flyte-binary.service.http.port" . }}
       userAuth:
         openId:
           baseUrl: {{ required "OIDC base URL required when authentication is enabled" .Values.configuration.auth.oidc.baseUrl | quote }}
diff --git a/charts/flyte-binary/templates/ingress/grpc.yaml b/charts/flyte-binary/templates/ingress/grpc.yaml
index ac4fda8bda..10701cb9e6 100644
--- a/charts/flyte-binary/templates/ingress/grpc.yaml
+++ b/charts/flyte-binary/templates/ingress/grpc.yaml
@@ -30,86 +30,86 @@ spec:
       {{- end }}
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            name: {{ include "flyte-binary.service.grpc.name" . }}
             port:
-              number: {{ include "flyte-binary.service.grpcPort" . }}
+              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.grpcPort" . }}
+              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.grpcPort" . }}
+              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.grpcPort" . }}
+              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.grpcPort" . }}
+              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.grpcPort" . }}
+              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.grpcPort" . }}
+              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.grpcPort" . }}
+              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.grpcPort" . }}
+              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.grpcPort" . }}
+              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.grpcPort" . }}
+              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.grpcPort" . }}
+              number: {{ include "flyte-binary.service.grpc.port" . }}
         path: /flyteidl.service.SignalService/*
         pathType: ImplementationSpecific
       {{- if .Values.ingress.grpcExtraPaths.append }}
diff --git a/charts/flyte-binary/templates/ingress/http.yaml b/charts/flyte-binary/templates/ingress/http.yaml
index 9591d15cb9..e854849503 100644
--- a/charts/flyte-binary/templates/ingress/http.yaml
+++ b/charts/flyte-binary/templates/ingress/http.yaml
@@ -30,135 +30,135 @@ spec:
       {{- end }}
       - backend:
           service:
-            name: {{ include "flyte-binary.fullname" . }}
+            name: {{ include "flyte-binary.service.http.name" . }}
             port:
-              number: {{ include "flyte-binary.service.httpPort" . }}
+              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.httpPort" . }}
+              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.httpPort" . }}
+              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.httpPort" . }}
+              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.httpPort" . }}
+              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.httpPort" . }}
+              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.httpPort" . }}
+              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.httpPort" . }}
+              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.httpPort" . }}
+              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.httpPort" . }}
+              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.httpPort" . }}
+              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.httpPort" . }}
+              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.httpPort" . }}
+              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.httpPort" . }}
+              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.httpPort" . }}
+              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.httpPort" . }}
+              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.httpPort" . }}
+              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.httpPort" . }}
+              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.httpPort" . }}
+              number: {{ include "flyte-binary.service.http.port" . }}
         path: /oauth2/*
         pathType: ImplementationSpecific
       {{- if .Values.ingress.httpExtraPaths.append }}
diff --git a/charts/flyte-binary/templates/service/grpc.yaml b/charts/flyte-binary/templates/service/grpc.yaml
new file mode 100644
index 0000000000..eb8d3d0063
--- /dev/null
+++ b/charts/flyte-binary/templates/service/grpc.yaml
@@ -0,0 +1,49 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "flyte-binary.service.grpc.name" . }}
+  namespace: {{ .Release.Namespace | quote }}
+  labels: {{- include "flyte-binary.labels" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }}
+    {{- end }}
+    {{- if .Values.service.labels }}
+    {{- tpl ( .Values.service.labels | toYaml ) . | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- if .Values.commonAnnotations }}
+    {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }}
+    {{- end }}
+    {{- if .Values.service.annotations }}
+    {{- tpl ( .Values.service.annotations | toYaml ) . | nindent 4 }}
+    {{- end }}
+    {{- if .Values.service.commonAnnotations }}
+    {{- tpl ( .Values.service.commonAnnotations | toYaml ) . | nindent 4 }}
+    {{- end }}
+    {{- if .Values.service.grpcAnnotations }}
+    {{- tpl ( .Values.service.grpcAnnotations | toYaml ) . | nindent 4 }}
+    {{- end }}
+spec:
+  type: {{ .Values.service.type }}
+  {{- if or (eq .Values.service.type "LoadBalancer") (eq .Values.service.type "NodePort") }}
+  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy | quote }}
+  {{- end }}
+  {{- if and (eq .Values.service.type "LoadBalancer") (not (empty .Values.service.loadBalancerSourceRanges)) }}
+  loadBalancerSourceRanges: {{ .Values.service.loadBalancerSourceRanges }}
+  {{- end }}
+  {{- if and (eq .Values.service.type "LoadBalancer") (not (empty .Values.service.loadBalancerIP)) }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+  {{- end }}
+  {{- if and .Values.service.clusterIP (eq .Values.service.type "ClusterIP") }}
+  clusterIP: {{ .Values.service.clusterIP }}
+  {{- end }}
+  ports:
+    - 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 }}
+  selector: {{- include "flyte-binary.selectorLabels" . | nindent 4 }}
diff --git a/charts/flyte-binary/templates/service/main.yaml b/charts/flyte-binary/templates/service/http.yaml
similarity index 79%
rename from charts/flyte-binary/templates/service/main.yaml
rename to charts/flyte-binary/templates/service/http.yaml
index 9c93ff38d5..189ea1e040 100644
--- a/charts/flyte-binary/templates/service/main.yaml
+++ b/charts/flyte-binary/templates/service/http.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "flyte-binary.fullname" . }}
+  name: {{ include "flyte-binary.service.http.name" . }}
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "flyte-binary.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
@@ -17,6 +17,12 @@ metadata:
     {{- if .Values.service.annotations }}
     {{- tpl ( .Values.service.annotations | toYaml ) . | nindent 4 }}
     {{- end }}
+    {{- if .Values.service.commonAnnotations }}
+    {{- tpl ( .Values.service.commonAnnotations | toYaml ) . | nindent 4 }}
+    {{- end }}
+    {{- if .Values.service.httpAnnotations }}
+    {{- tpl ( .Values.service.httpAnnotations | toYaml ) . | nindent 4 }}
+    {{- end }}
 spec:
   type: {{ .Values.service.type }}
   {{- if or (eq .Values.service.type "LoadBalancer") (eq .Values.service.type "NodePort") }}
@@ -33,21 +39,13 @@ spec:
   {{- end }}
   ports:
     - name: http
-      port: {{ include "flyte-binary.service.httpPort" . }}
+      port: {{ include "flyte-binary.service.http.port" . }}
       targetPort: http
       {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.http)) }}
       nodePort: {{ .Values.service.nodePorts.http }}
       {{- else if eq .Values.service.type "ClusterIP" }}
       nodePort: null
       {{- end }}
-    - name: grpc
-      port: {{ include "flyte-binary.service.grpcPort" . }}
-      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 }}
     {{- if .Values.service.extraPorts }}
     {{- tpl ( .Values.service.extraPorts | toYaml ) . | nindent 4 }}
     {{- end }}
diff --git a/charts/flyte-binary/templates/service/webhook.yaml b/charts/flyte-binary/templates/service/webhook.yaml
index f5375b1f70..b39c1d3661 100644
--- a/charts/flyte-binary/templates/service/webhook.yaml
+++ b/charts/flyte-binary/templates/service/webhook.yaml
@@ -17,6 +17,9 @@ metadata:
     {{- if .Values.service.annotations }}
     {{- tpl ( .Values.service.annotations | toYaml ) . | nindent 4 }}
     {{- end }}
+    {{- if .Values.service.commonAnnotations }}
+    {{- tpl ( .Values.service.commonAnnotations | toYaml ) . | nindent 4 }}
+    {{- end }}
 spec:
   type: ClusterIP
   ports:
diff --git a/charts/flyte-binary/values.yaml b/charts/flyte-binary/values.yaml
index eae7461b9d..c4aafd88de 100644
--- a/charts/flyte-binary/values.yaml
+++ b/charts/flyte-binary/values.yaml
@@ -248,8 +248,12 @@ service:
   clusterIP: ""
   # labels Add labels to Flyte services
   labels: {}
-  # annotations Add annotations to Flyte services
-  annotations: {}
+  # commonAnnotations Add annotations to Flyte services
+  commonAnnotations: {}
+  # httpAnnotations Add annotations to http service resource
+  httpAnnotations: {}
+  # grpcAnnotations Add annotations to grpc service resource
+  grpcAnnotations: {}
   # loadBalancerIP Set static IP if service type is `LoadBalancer`
   loadBalancerIP: ""
   # externalTrafficPolicy Enable client source IP preservation if service type is `NodePort` or `LoadBalancer`
@@ -270,9 +274,9 @@ ingress:
   host: ""
   # commonAnnotations Add common annotations to all ingress resources
   commonAnnotations: {}
-  # httpAnnotations Add common annotations to http ingress resource
+  # httpAnnotations Add annotations to http ingress resource
   httpAnnotations: {}
-  # grpcAnnotations Add common annotations to grpc ingress resource
+  # grpcAnnotations Add annotations to grpc ingress resource
   grpcAnnotations: {}
   # httpExtraPaths Add extra paths to http ingress rule
   httpExtraPaths:
diff --git a/charts/flyte-sandbox/Chart.lock b/charts/flyte-sandbox/Chart.lock
index 121a13f878..7d720bb84f 100644
--- 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-23T20:15:22.877977-07:00"
+generated: "2023-03-31T09:25:07.80904-07:00"
diff --git a/charts/flyte-sandbox/templates/proxy/configmap.yaml b/charts/flyte-sandbox/templates/proxy/configmap.yaml
index 83ec877ce0..362597aa9e 100644
--- a/charts/flyte-sandbox/templates/proxy/configmap.yaml
+++ b/charts/flyte-sandbox/templates/proxy/configmap.yaml
@@ -149,7 +149,7 @@ data:
                                   address:
                                       socket_address:
                                           {{- if index .Values "flyte-binary" "enabled" }}
-                                          address: {{ include "flyte-sandbox.fullname" .}}
+                                          address: {{ include "flyte-binary.service.http.name" .}}
                                           {{- else }}
                                           address: {{ include "flyte-sandbox.localHeadlessService" . }}
                                           {{- end }}
@@ -167,7 +167,7 @@ data:
                                   address:
                                       socket_address:
                                           {{- if index .Values "flyte-binary" "enabled" }}
-                                          address: {{ include "flyte-sandbox.fullname" .}}
+                                          address: {{ include "flyte-binary.service.grpc.name" .}}
                                           {{- else }}
                                           address: {{ include "flyte-sandbox.localHeadlessService" . }}
                                           {{- end }}
diff --git a/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml b/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml
index c0de679b73..467dd9b4a2 100644
--- a/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml
+++ b/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml
@@ -226,11 +226,11 @@ subjects:
     name: flyte-flyte-binary
     namespace: "flyte"
 ---
-# Source: flyte-binary/templates/service/main.yaml
+# Source: flyte-binary/templates/service/grpc.yaml
 apiVersion: v1
 kind: Service
 metadata:
-  name: flyte-flyte-binary
+  name: flyte-flyte-binary-grpc
   namespace: "flyte"
   labels:
     helm.sh/chart: flyte-binary-v0.1.10
@@ -242,10 +242,6 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - name: http
-      port: 8088
-      targetPort: http
-      nodePort: null
     - name: grpc
       port: 8089
       targetPort: grpc
@@ -254,6 +250,30 @@ spec:
     app.kubernetes.io/name: flyte-binary
     app.kubernetes.io/instance: flyte
 ---
+# Source: flyte-binary/templates/service/http.yaml
+apiVersion: v1
+kind: Service
+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:
+  type: ClusterIP
+  ports:
+    - name: http
+      port: 8088
+      targetPort: http
+      nodePort: null
+  selector:
+    app.kubernetes.io/name: flyte-binary
+    app.kubernetes.io/instance: flyte
+---
 # Source: flyte-binary/templates/service/webhook.yaml
 apiVersion: v1
 kind: Service
diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml
index 7945ef1cef..69f7a8e86f 100644
--- a/docker/sandbox-bundled/manifests/complete.yaml
+++ b/docker/sandbox-bundled/manifests/complete.yaml
@@ -682,7 +682,7 @@ data:
                             - endpoint:
                                   address:
                                       socket_address:
-                                          address: flyte-sandbox
+                                          address: flyte-sandbox-http
                                           port_value: 8088
             - name: flyte_grpc
               connect_timeout: 0.25s
@@ -696,7 +696,7 @@ data:
                             - endpoint:
                                   address:
                                       socket_address:
-                                          address: flyte-sandbox
+                                          address: flyte-sandbox-grpc
                                           port_value: 8089
             - name: kubernetes-dashboard
               connect_timeout: 0.25s
@@ -765,7 +765,7 @@ type: Opaque
 ---
 apiVersion: v1
 data:
-  haSharedSecret: VnBOU0tUSU41Q2xCcnlQeA==
+  haSharedSecret: ZFhUZHV6bzFHUUVmUkJkVw==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -849,6 +849,28 @@ type: Opaque
 ---
 apiVersion: v1
 kind: Service
+metadata:
+  labels:
+    app: docker-registry
+    chart: docker-registry-2.2.2
+    heritage: Helm
+    release: flyte-sandbox
+  name: flyte-sandbox-docker-registry
+  namespace: flyte
+spec:
+  ports:
+  - name: http-5000
+    nodePort: 30000
+    port: 5000
+    protocol: TCP
+    targetPort: 5000
+  selector:
+    app: docker-registry
+    release: flyte-sandbox
+  type: NodePort
+---
+apiVersion: v1
+kind: Service
 metadata:
   labels:
     app.kubernetes.io/instance: flyte-sandbox
@@ -856,14 +878,10 @@ metadata:
     app.kubernetes.io/name: flyte-sandbox
     app.kubernetes.io/version: 1.16.0
     helm.sh/chart: flyte-binary-v0.1.10
-  name: flyte-sandbox
+  name: flyte-sandbox-grpc
   namespace: flyte
 spec:
   ports:
-  - name: http
-    nodePort: null
-    port: 8088
-    targetPort: http
   - name: grpc
     nodePort: null
     port: 8089
@@ -877,23 +895,23 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: docker-registry
-    chart: docker-registry-2.2.2
-    heritage: Helm
-    release: flyte-sandbox
-  name: flyte-sandbox-docker-registry
+    app.kubernetes.io/instance: flyte-sandbox
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: flyte-sandbox
+    app.kubernetes.io/version: 1.16.0
+    helm.sh/chart: flyte-binary-v0.1.10
+  name: flyte-sandbox-http
   namespace: flyte
 spec:
   ports:
-  - name: http-5000
-    nodePort: 30000
-    port: 5000
-    protocol: TCP
-    targetPort: 5000
+  - name: http
+    nodePort: null
+    port: 8088
+    targetPort: http
   selector:
-    app: docker-registry
-    release: flyte-sandbox
-  type: NodePort
+    app.kubernetes.io/instance: flyte-sandbox
+    app.kubernetes.io/name: flyte-sandbox
+  type: ClusterIP
 ---
 apiVersion: v1
 kind: Service
@@ -1249,7 +1267,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: 91c457e16b511b53b62ae35de8ee25922d4f6bdd9314080917d35a4371913dfe
+        checksum/secret: b92785946803d08193af3fb96e9129686885d4f92cbf5cbb8eb122e529578770
       labels:
         app: docker-registry
         release: flyte-sandbox
diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml
index 5825ca4aba..43e95ce8d9 100644
--- a/docker/sandbox-bundled/manifests/dev.yaml
+++ b/docker/sandbox-bundled/manifests/dev.yaml
@@ -499,7 +499,7 @@ metadata:
 ---
 apiVersion: v1
 data:
-  haSharedSecret: VVEybHJXNFB1dG1MOGFHMw==
+  haSharedSecret: WXpTQXFIVjBFckZTa3YwZg==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -875,7 +875,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: c6c04852c5465cb16c65eece01dad679035d630a275fe214868372580cbfffc3
+        checksum/secret: 62e50630098c437e0102e73217d1f0b38a398774b11bffae2b6e581fa8e26e33
       labels:
         app: docker-registry
         release: flyte-sandbox