Updated and tested Seldon Core 1.15.0

.github/workflows/seldon_kind_test.yaml

@@ -0,0 +1,32 @@
+name: Build & Apply Seldon manifests in KinD
+on:
+  pull_request:
+    paths:
+      - contrib/seldon/**
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Install KinD
+      run: ./tests/gh-actions/install_kind.sh
+
+    - name: Create KinD Cluster
+      run: kind create cluster --config tests/gh-actions/kind-cluster-1-24.yaml
+
+    - name: Install kustomize
+      run: ./tests/gh-actions/install_kustomize.sh
+
+    - name: Install Istio
+      run: ./tests/gh-actions/install_istio.sh
+
+    - name: Install cert-manager
+      run: ./tests/gh-actions/install_cert_manager.sh
+
+    - name: Build & Apply manifests
+      run: |
+        cd contrib/seldon/
+        make test

contrib/seldon/Makefile

@@ -1,26 +1,44 @@
 
-# Copy values.yaml from desired seldon-core release and modify
-# If updating values.yaml
-# certManager: true
-# Istio.enabled: true
-# istio gateway
-# kubeflow: true
-
-# Presently need to remove generated status field from resources.yaml file manually
+SELDON_VERSION ?= 1.15.0
 
 seldon-core-operator/base: clean-kustomize
 	mkdir -p seldon-core-operator/base
-	cd seldon-core-operator/base && helm template -f ../../values.yaml seldon-core seldon-core-operator --repo https://storage.googleapis.com/seldon-charts --namespace kubeflow --version 1.6.0  > resources.yaml
-	#kfctl strangeness means these variables don't always get resolved see https://github.com/kubeflow/manifests/issues/1660
-	#sed -i 's#cert-manager.io/inject-ca-from:.*#cert-manager.io/inject-ca-from: $$(CERTIFICATE_NAMESPACE)/$$(CERTIFICATE_NAME)#g' seldon-core-operator/base/resources.yaml
+	cd seldon-core-operator/base && helm template -f ../../values.yaml seldon-core seldon-core-operator --repo https://storage.googleapis.com/seldon-charts --namespace kubeflow --version ${SELDON_VERSION}  > resources.yaml
 	sed -i 's#cert-manager.io/inject-ca-from:.*#cert-manager.io/inject-ca-from: kubeflow/seldon-serving-cert#g' seldon-core-operator/base/resources.yaml
-	sed -i "s#'seldon-webhook-service.kubeflow.svc.cluster.local'#"'$$(SERVICE_NAME).$$(SERVICE_NAMESPACE).svc.cluster.local#' seldon-core-operator/base/resources.yaml
-	sed -i "s#commonName: 'seldon-webhook-service.kubeflow.svc'#"'commonName: $$(SERVICE_NAME).$$(CERTIFICATE_NAMESPACE).svc#' seldon-core-operator/base/resources.yaml
-	sed -i "s#'seldon-webhook-service.kubeflow.svc'#"'$$(SERVICE_NAME).$$(SERVICE_NAMESPACE).svc#' seldon-core-operator/base/resources.yaml
+	sed -i "s#'seldon-webhook-service.kubeflow.svc.cluster.local'#"'seldon-webhook-service.$$(SERVICE_NAMESPACE).svc.cluster.local#' seldon-core-operator/base/resources.yaml
+	sed -i "s#commonName: 'seldon-webhook-service.kubeflow.svc'#"'commonName: seldon-webhook-service.$$(CERTIFICATE_NAMESPACE).svc#' seldon-core-operator/base/resources.yaml
+	sed -i "s#'seldon-webhook-service.kubeflow.svc'#"'seldon-webhook-service.$$(SERVICE_NAMESPACE).svc#' seldon-core-operator/base/resources.yaml
 	sed -i 's#kubeflow/kubeflow-gateway#$$(SERVICE_NAMESPACE)/kubeflow-gateway#' seldon-core-operator/base/resources.yaml
 	cp kustomization.tpl seldon-core-operator/base/kustomization.yaml
 	cp kustomizeconfig.tpl seldon-core-operator/base/kustomizeconfig.yaml
 
 .PHONY:clean-kustomize
 clean-kustomize:
 	rm -rf seldon-core-operator/base
+
+test:
+	# Create seldon namespace
+	kubectl create namespace seldon || echo "seldon namespace exists"
+	# Create kubeflow namespace if not exists
+	kubectl create namespace kubeflow || echo "kubeflow namespace exists"
+	# Creating resources
+	kustomize build seldon-core-operator/base | kubectl apply -n kubeflow -f -
+	# Waiting for resources
+	kubectl wait --for condition=Available -n kubeflow deployment/seldon-controller-manager
+	# Wait for manager resources to be created
+	sleep 5
+	# Create example deployment
+	kubectl apply -n seldon -f example.yaml
+	# Wait for manager resources to be created
+	sleep 5
+	kubectl get deploy -A
+	sleep 5
+	kubectl logs -n kubeflow deployment/seldon-controller-manager
+	sleep 5
+	kubectl get deploy -A
+	# Wait for deployment
+	kubectl wait --for condition=Available -n seldon deployment/echo-default-0-classifier --timeout=360s
+	# Remove deployment
+	kubectl delete -n seldon -f example.yaml
+	# Cleaning resources
+	kustomize build seldon-core-operator/base | kubectl delete -n kubeflow -f -

contrib/seldon/README.md

@@ -1,6 +1,14 @@
-# Seldon Kustomize 
+# Seldon Core
 
-## Install Seldon Operator
+[Seldon Core](https://github.com/SeldonIO/seldon-core/) is a framework to deploy your machine learning models on Kubernetes at scale.
+
+# Requirements
+
+* Kubernetes 1.18 - 1.24
+
+Support for Kubernetes 1.25 is currently part of [SeldonIO/seldon-core#4172](https://github.com/SeldonIO/seldon-core/pull/4172)
+
+## Install Seldon Core Operator
 
  * The yaml assumes you will install in kubeflow namespace
  * You need to have installed istio first
@@ -11,8 +19,74 @@ kustomize build seldon-core-operator/base | kubectl apply -n kubeflow -f -
 
 ## Updating
 
-This kustomize spec was created from the seldon-core-operator helm chart with:
+See [UPGRADE.md](UPGRADE.md)
+
+## Testing
+
+```
+make test
+```
+
+# Overview
+
+We can create a test model once the "Install Seldon Operator" is configured
+
+```
+# Create namespace for model
+kubectl create namespace seldon
+```
+
+We can create an echo model with the following command:
 
 ```
-make clean seldon-core-operator/base
+kubectl apply -f - << ENDapiVersion: machinelearning.seldon.io/v1
+kind: SeldonDeployment
+metadata:
+  name: echo
+  namespace: seldon
+spec:
+  predictors:
+  - name: default
+    replicas: 1
+    graph:
+      name: classifier
+      type: MODEL
+    componentSpecs:
+    - spec:
+        containers:
+        - image: seldonio/echo-model:1.15.0-dev
+          name: classifier
+END
 ```
+
+We can verify that model is running:
+
+```
+kubectl get pods -n seldon
+
+NAME                                         READY   STATUS    RESTARTS   AGE
+echo-default-0-classifier-679cb5fb68-qd4nm   2/2     Running   0          25m
+```
+
+Also we can verify that the correct virtualservice was created:
+
+```
+kubectl get virtualservice -n seldon
+
+NAME   GATEWAYS                        HOSTS   AGE
+echo   ["kubeflow/kubeflow-gateway"]   ["*"]   42m
+```
+
+Finally we can send a request (you will need to fetch the Dex Auth Token / Cookie):
+
+```
+export CLUSTER_IP=# Your cluster IP
+export SESSION=# Your dex session
+
+curl -H "Content-Type: application/json" -H "Cookie: authservice_session=${SESSION}" \
+   -d '{"data": {"ndarray":[[1.0, 2.0, 5.0]]}}' \
+   http://{CLUSTER_IP}/seldon/seldon/echo/api/v1.0/predictions
+
+{"data":{"names":["t:0","t:1","t:2"],"ndarray":[[1.0,2.0,5.0]]},"meta":{"metrics":[{"key":"mycounter","type":"COUNTER","value":1},{"key":"mygauge","type":"GAUGE","value":100},{"key":"mytimer","type":"TIMER","value":20.2}],"requestPath":{"classifier":"seldonio/echo-model:1.15.0-dev"}}}
+```
+

contrib/seldon/UPGRADE.md

@@ -0,0 +1,33 @@
+# Upgrading Documentation
+
+## Updating manifests
+
+In order to update manifests make sure you are running the commands in linux.
+
+If you are running in another OS, please make sure to update the Makefile commands.
+
+You can refresh the configuration by running:
+
+```
+make seldon-core-operator/base
+```
+
+## Updating to specific version
+
+Upgrading the version can be done by setting the `SELDON_VERSION` environment variable, such as:
+
+```
+# Set the desired version
+export SELDON_VERSION=1.14.0
+
+# Rebuild the kustomize base
+make seldon-core-operator/base
+
+# Run new manifests against cluster
+kustomize build seldon-core-operator/base | kubectl apply -f -
+```
+
+## Instructions for breaking changes
+
+The [core upgrading docs](https://docs.seldon.io/projects/seldon-core/en/latest/reference/upgrading.html.) provide step by step overview of breaking changes across minor and patch versions.
+

contrib/seldon/example.yaml

@@ -0,0 +1,15 @@
+apiVersion: machinelearning.seldon.io/v1
+kind: SeldonDeployment
+metadata:
+  name: echo
+spec:
+  predictors:
+  - name: default
+    graph:
+      name: classifier
+      type: MODEL
+    componentSpecs:
+    - spec:
+        containers:
+        - image: seldonio/echo-model:1.15.0-dev
+          name: classifier

contrib/seldon/kustomization.tpl

@@ -11,25 +11,21 @@ vars:
   objref:
     kind: Certificate
     group: cert-manager.io
-    version: v1alpha2
+    version: v1
     name: seldon-serving-cert # this name should match the one in certificate.yaml
   fieldref:
     fieldpath: metadata.namespace
 - name: CERTIFICATE_NAME
   objref:
     kind: Certificate
     group: cert-manager.io
-    version: v1alpha2
+    version: v1
     name: seldon-serving-cert # this name should match the one in certificate.yaml
 - name: SERVICE_NAMESPACE # namespace of the service
   objref:
-    kind: Service
+    kind: Deployment
     version: v1
-    name: seldon-webhook-service
+    group: apps
+    name: seldon-controller-manager
   fieldref:
     fieldpath: metadata.namespace
-- name: SERVICE_NAME
-  objref:
-    kind: Service
-    version: v1
-    name: seldon-webhook-service

contrib/seldon/seldon-core-operator/base/kustomization.yaml

@@ -2,7 +2,6 @@
 # and emits as a YAML string
 resources:
 - resources.yaml
-- kubeflow-edit-seldon.yaml
 
 configurations:
   - kustomizeconfig.yaml
@@ -12,25 +11,21 @@ vars:
   objref:
     kind: Certificate
     group: cert-manager.io
-    version: v1alpha2
+    version: v1
     name: seldon-serving-cert # this name should match the one in certificate.yaml
   fieldref:
     fieldpath: metadata.namespace
 - name: CERTIFICATE_NAME
   objref:
     kind: Certificate
     group: cert-manager.io
-    version: v1alpha2
+    version: v1
     name: seldon-serving-cert # this name should match the one in certificate.yaml
 - name: SERVICE_NAMESPACE # namespace of the service
   objref:
-    kind: Service
+    kind: Deployment
     version: v1
-    name: seldon-webhook-service
+    group: apps
+    name: seldon-controller-manager
   fieldref:
     fieldpath: metadata.namespace
-- name: SERVICE_NAME
-  objref:
-    kind: Service
-    version: v1
-    name: seldon-webhook-service