From c16f09b430e051ee841e488559a56fa92e26cd41 Mon Sep 17 00:00:00 2001
From: Alex Rakowski <20504869+agrski@users.noreply.github.com>
Date: Wed, 19 Oct 2022 16:26:03 +0100
Subject: [PATCH] Add Helm parameterisation for scheduler and Envoy service
 types (#520)

* Remove trailing whitespace from SCv2 component Helm chart values

* Add Kustomize patch for Envoy service type in components Helm chart

* Add default Helm value for Envoy service type

* Add Kustomize patch for scheduler service type in components Helm chart

* Add default Helm value for scheduler service type
---
 .../templates/seldon-v2-components.yaml                   | 4 ++--
 k8s/helm-charts/seldon-core-v2-setup/values.yaml          | 8 ++++++--
 k8s/helm-charts/seldon-core-v2-setup/values.yaml.template | 8 ++++++--
 k8s/kustomize/helm-components/patch_envoy.yaml            | 7 +++++++
 k8s/kustomize/helm-components/patch_scheduler.yaml        | 7 +++++++
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/k8s/helm-charts/seldon-core-v2-setup/templates/seldon-v2-components.yaml b/k8s/helm-charts/seldon-core-v2-setup/templates/seldon-v2-components.yaml
index b16aeb7f23..d2b7687605 100644
--- a/k8s/helm-charts/seldon-core-v2-setup/templates/seldon-v2-components.yaml
+++ b/k8s/helm-charts/seldon-core-v2-setup/templates/seldon-v2-components.yaml
@@ -465,7 +465,7 @@ spec:
     targetPort: envoy-admin
   selector:
     app: seldon-envoy
-  type: LoadBalancer
+  type: '{{ .Values.envoy.service.type }}'
 ---
 apiVersion: v1
 kind: Service
@@ -523,7 +523,7 @@ spec:
     targetPort: dataflow
   selector:
     control-plane: seldon-scheduler
-  type: LoadBalancer
+  type: '{{ .Values.scheduler.service.type }}'
 ---
 apiVersion: apps/v1
 kind: Deployment
diff --git a/k8s/helm-charts/seldon-core-v2-setup/values.yaml b/k8s/helm-charts/seldon-core-v2-setup/values.yaml
index 859e5ca5cf..f7ac0b929a 100644
--- a/k8s/helm-charts/seldon-core-v2-setup/values.yaml
+++ b/k8s/helm-charts/seldon-core-v2-setup/values.yaml
@@ -62,7 +62,7 @@ security:
           crtPath: /tmp/certs/ddc/tls.crt
           caPath: /tmp/certs/ddc/ca.crt
           serverCaPath: /tmp/certs/dds/ca.crt
-  
+
 opentelemetry:
   endpoint: seldon-collector:4317
   enable: true
@@ -146,6 +146,8 @@ envoy:
     registry: docker.io
     repository: seldonio/seldon-envoy
     tag: latest
+  service:
+    type: LoadBalancer
 
 scheduler:
   image:
@@ -153,7 +155,9 @@ scheduler:
     registry: docker.io
     repository: seldonio/seldon-scheduler
     tag: latest
-      
+  service:
+    type: LoadBalancer
+
 serverConfig:
   rclone:
     image:
diff --git a/k8s/helm-charts/seldon-core-v2-setup/values.yaml.template b/k8s/helm-charts/seldon-core-v2-setup/values.yaml.template
index 02ec694b5c..4962970b03 100644
--- a/k8s/helm-charts/seldon-core-v2-setup/values.yaml.template
+++ b/k8s/helm-charts/seldon-core-v2-setup/values.yaml.template
@@ -62,7 +62,7 @@ security:
           crtPath: /tmp/certs/ddc/tls.crt
           caPath: /tmp/certs/ddc/ca.crt
           serverCaPath: /tmp/certs/dds/ca.crt
-  
+
 opentelemetry:
   endpoint: seldon-collector:4317
   enable: true
@@ -146,6 +146,8 @@ envoy:
     registry: docker.io
     repository: seldonio/seldon-envoy
     tag: #TAG_VERSION_PLACEHOLDER#
+  service:
+    type: LoadBalancer
 
 scheduler:
   image:
@@ -153,7 +155,9 @@ scheduler:
     registry: docker.io
     repository: seldonio/seldon-scheduler
     tag: #TAG_VERSION_PLACEHOLDER#
-      
+  service:
+    type: LoadBalancer
+
 serverConfig:
   rclone:
     image:
diff --git a/k8s/kustomize/helm-components/patch_envoy.yaml b/k8s/kustomize/helm-components/patch_envoy.yaml
index 56c1af2f6b..e87410a14c 100644
--- a/k8s/kustomize/helm-components/patch_envoy.yaml
+++ b/k8s/kustomize/helm-components/patch_envoy.yaml
@@ -30,3 +30,10 @@ spec:
                 name: '{{ .Values.security.controlplane.ssl.client.serverValidationSecret }}' 
                 key: ca.crt
                 optional: true 
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: seldon-mesh
+spec:
+  type: '{{ .Values.envoy.service.type }}'
diff --git a/k8s/kustomize/helm-components/patch_scheduler.yaml b/k8s/kustomize/helm-components/patch_scheduler.yaml
index c99957a89b..3d27468243 100644
--- a/k8s/kustomize/helm-components/patch_scheduler.yaml
+++ b/k8s/kustomize/helm-components/patch_scheduler.yaml
@@ -50,3 +50,10 @@ spec:
             value: '{{ .Values.security.envoy.ssl.downstream.server.caPath }}'
           - name: ENVOY_DOWNSTREAM_CLIENT_TLS_CA_LOCATION
             value: '{{ .Values.security.envoy.ssl.downstream.server.clientCaPath }}'
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: scheduler
+spec:
+  type: '{{ .Values.scheduler.service.type }}'