Merge pull request #1414 from cliveseldon/1411_kubeflow_req

Kubeflow manifest changes
SeldonIO · Feb 12, 2020 · ef722f9 · ef722f9
2 parents 9acb670 + ade3ee8
commit ef722f9
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 2 deletions.
diff --git a/helm-charts/seldon-core-operator/templates/deployment_seldon-controller-manager.yaml b/helm-charts/seldon-core-operator/templates/deployment_seldon-controller-manager.yaml
@@ -22,6 +22,7 @@ spec:
     metadata:
       annotations:
         prometheus.io/scrape: 'true'
+        sidecar.istio.io/inject: 'false'
       labels:
         app: seldon
         app.kubernetes.io/instance: seldon1

diff --git a/helm-charts/seldon-core-operator/templates/webhook.yaml b/helm-charts/seldon-core-operator/templates/webhook.yaml
@@ -30,13 +30,18 @@ webhooks:
     matchExpressions:
     - key: seldon.io/controller-id
       operator: DoesNotExist
+{{- if .Values.kubeflow }}
+    matchLabels:
+      serving.kubeflow.org/inferenceservice: enabled
+{{- end }}
 {{- end }}
 {{- end }}
 {{- if .Values.singleNamespace }}
   namespaceSelector:
     matchLabels:
       seldon.io/controller-id: {{ .Release.Namespace }}
 {{- end }}
+{{- if not .Values.kubeflow }}
 {{- if semverCompare ">=1.15.0" .Capabilities.KubeVersion.GitVersion }}
 {{- if not .Values.controllerId }}
   objectSelector:
@@ -49,6 +54,7 @@ webhooks:
   objectSelector:
     matchLabels:
       seldon.io/controller-id: {{ .Values.controllerId }}
+{{- end }}
 {{- end }}
   rules:
   - apiGroups:
@@ -74,13 +80,18 @@ webhooks:
     matchExpressions:
     - key: seldon.io/controller-id
       operator: DoesNotExist
+{{- if .Values.kubeflow }}
+    matchLabels:
+      serving.kubeflow.org/inferenceservice: enabled
+{{- end }}
 {{- end }}
 {{- end }}
 {{- if .Values.singleNamespace }}
   namespaceSelector:
     matchLabels:
       seldon.io/controller-id: {{ .Release.Namespace }}
 {{- end }}
+{{- if not .Values.kubeflow }}
 {{- if semverCompare ">=1.15.0" .Capabilities.KubeVersion.GitVersion }}
 {{- if not .Values.controllerId }}
   objectSelector:
@@ -93,6 +104,7 @@ webhooks:
   objectSelector:
     matchLabels:
       seldon.io/controller-id: {{ .Values.controllerId }}
+{{- end }}
 {{- end }}
   rules:
   - apiGroups:
@@ -118,13 +130,18 @@ webhooks:
     matchExpressions:
     - key: seldon.io/controller-id
       operator: DoesNotExist
+{{- if .Values.kubeflow }}
+    matchLabels:
+      serving.kubeflow.org/inferenceservice: enabled
+{{- end }}
 {{- end }}
 {{- end }}
 {{- if .Values.singleNamespace }}
   namespaceSelector:
     matchLabels:
       seldon.io/controller-id: {{ .Release.Namespace }}
 {{- end }}
+{{- if not .Values.kubeflow }}
 {{- if semverCompare ">=1.15.0" .Capabilities.KubeVersion.GitVersion }}
 {{- if not .Values.controllerId }}
   objectSelector:
@@ -137,6 +154,7 @@ webhooks:
   objectSelector:
     matchLabels:
       seldon.io/controller-id: {{ .Values.controllerId }}
+{{- end }}
 {{- end }}
   rules:
   - apiGroups:
@@ -177,13 +195,18 @@ webhooks:
     matchExpressions:
     - key: seldon.io/controller-id
       operator: DoesNotExist
+{{- if .Values.kubeflow }}
+    matchLabels:
+      serving.kubeflow.org/inferenceservice: enabled
+{{- end }}
 {{- end }}
 {{- end }}
 {{- if .Values.singleNamespace }}
   namespaceSelector:
     matchLabels:
       seldon.io/controller-id: {{ .Release.Namespace }}
 {{- end }}
+{{- if not .Values.kubeflow }}
 {{- if semverCompare ">=1.15.0" .Capabilities.KubeVersion.GitVersion }}
 {{- if not .Values.controllerId }}
   objectSelector:
@@ -196,6 +219,7 @@ webhooks:
   objectSelector:
     matchLabels:
       seldon.io/controller-id: {{ .Values.controllerId }}
+{{- end }}
 {{- end }}
   rules:
   - apiGroups:
@@ -221,13 +245,18 @@ webhooks:
     matchExpressions:
     - key: seldon.io/controller-id
       operator: DoesNotExist
+{{- if .Values.kubeflow }}
+    matchLabels:
+      serving.kubeflow.org/inferenceservice: enabled
+{{- end }}
 {{- end }}
 {{- end }}
 {{- if .Values.singleNamespace }}
   namespaceSelector:
     matchLabels:
       seldon.io/controller-id: {{ .Release.Namespace }}
 {{- end }}
+{{- if not .Values.kubeflow }}
 {{- if semverCompare ">=1.15.0" .Capabilities.KubeVersion.GitVersion }}
 {{- if not .Values.controllerId }}
   objectSelector:
@@ -240,6 +269,7 @@ webhooks:
   objectSelector:
     matchLabels:
       seldon.io/controller-id: {{ .Values.controllerId }}
+{{- end }}
 {{- end }}
   rules:
   - apiGroups:
@@ -265,13 +295,18 @@ webhooks:
     matchExpressions:
     - key: seldon.io/controller-id
       operator: DoesNotExist
+{{- if .Values.kubeflow }}
+    matchLabels:
+      serving.kubeflow.org/inferenceservice: enabled
+{{- end }}
 {{- end }}
 {{- end }}
 {{- if .Values.singleNamespace }}
   namespaceSelector:
     matchLabels:
       seldon.io/controller-id: {{ .Release.Namespace }}
 {{- end }}
+{{- if not .Values.kubeflow }}
 {{- if semverCompare ">=1.15.0" .Capabilities.KubeVersion.GitVersion }}
 {{- if not .Values.controllerId }}
   objectSelector:
@@ -284,6 +319,7 @@ webhooks:
   objectSelector:
     matchLabels:
       seldon.io/controller-id: {{ .Values.controllerId }}
+{{- end }}
 {{- end }}
   rules:
   - apiGroups:

diff --git a/helm-charts/seldon-core-operator/values.yaml b/helm-charts/seldon-core-operator/values.yaml
@@ -51,6 +51,8 @@ istio:
   enabled: false
   gateway: seldon-gateway
   tlsMode: ''
+kubeflow:
+  false
 manager:
   memoryRequest: 200Mi
   memoryLimit: 300Mi

diff --git a/operator/config/manager/manager.yaml b/operator/config/manager/manager.yaml
@@ -19,6 +19,8 @@ spec:
   replicas: 1
   template:
     metadata:
+      annotations:
+        sidecar.istio.io/inject: 'false'
       labels:
         control-plane: seldon-controller-manager
     spec:

diff --git a/operator/helm/split_resources.py b/operator/helm/split_resources.py
@@ -20,6 +20,8 @@
 HELM_CERTMANAGER_IF_START = '{{- if .Values.certManager.enabled -}}\n'
 HELM_NOT_CERTMANAGER_IF_START = '{{- if not .Values.certManager.enabled -}}\n'
 HELM_VERSION_IF_START= '{{- if semverCompare ">=1.15.0" .Capabilities.KubeVersion.GitVersion }}\n'
+HELM_KUBEFLOW_IF_START='{{- if .Values.kubeflow }}\n'
+HELM_KUBEFLOW_IF_NOT_START='{{- if not .Values.kubeflow }}\n'
 #HELM_SECRET_IF_START = '{{- if .Values.webhook.secretProvided -}}\n'
 HELM_IF_END = '{{- end }}\n'
 
@@ -220,8 +222,9 @@ def helm_release(value: str):
     # Write webhook related data in 1 file
     namespaceSelector = "  namespaceSelector:\n    matchLabels:\n      seldon.io/controller-id: " + helm_release("Namespace") + "\n"
     objectSelector = "  objectSelector:\n    matchLabels:\n      seldon.io/controller-id: " + helm_value("controllerId") + "\n"
-    webhookData = re.sub(r"(.*namespaceSelector:\n.*matchExpressions:\n.*\n.*\n)",HELM_VERSION_IF_START+HELM_NOT_SINGLE_NAMESPACE_IF_START+r"\1"+HELM_IF_END+HELM_IF_END+HELM_SINGLE_NAMESPACE_IF_START+namespaceSelector+HELM_IF_END,webhookData, re.M)
-    webhookData = re.sub(r"(.*objectSelector:\n.*matchExpressions:\n.*\n.*\n)",HELM_VERSION_IF_START+HELM_NOT_CONTROLLERID_IF_START+r"\1"+HELM_IF_END+HELM_IF_END+HELM_CONTROLLERID_IF_START+objectSelector+HELM_IF_END,webhookData, re.M)
+    kubeflowSelector = "    matchLabels:\n      serving.kubeflow.org/inferenceservice: enabled\n"
+    webhookData = re.sub(r"(.*namespaceSelector:\n.*matchExpressions:\n.*\n.*\n)",HELM_VERSION_IF_START+HELM_NOT_SINGLE_NAMESPACE_IF_START+r"\1"+HELM_KUBEFLOW_IF_START+kubeflowSelector+HELM_IF_END+HELM_IF_END+HELM_IF_END+HELM_SINGLE_NAMESPACE_IF_START+namespaceSelector+HELM_IF_END,webhookData, re.M)
+    webhookData = re.sub(r"(.*objectSelector:\n.*matchExpressions:\n.*\n.*\n)",HELM_KUBEFLOW_IF_NOT_START+HELM_VERSION_IF_START+HELM_NOT_CONTROLLERID_IF_START+r"\1"+HELM_IF_END+HELM_IF_END+HELM_CONTROLLERID_IF_START+objectSelector+HELM_IF_END+HELM_IF_END,webhookData, re.M)
 
     filename = args.folder + "/" + "webhook.yaml"
     with open(filename, 'w') as outfile: