Integrate use of Go Seldon Controller

.gitignore

@@ -199,3 +199,5 @@ testing/scripts/tensorflow
 testing/scripts/run.log
 testing/scripts/my-model/
 wrappers/s2i/python/_python/
+
+seldon-controller/go

Makefile.ci

@@ -1,18 +1,18 @@
 .PHONY: build
 build:
-	@set -x && cd cluster-manager && make -f Makefile.ci $@
+	@set -x && cd seldon-controller && make -f Makefile $@
 	@set -x && cd api-frontend && make -f Makefile.ci $@
 	@set -x && cd engine && make -f Makefile.ci clean $@
 
 .PHONY: push_images_private_repo
 push_images_private_repo:
-	@set -x && cd cluster-manager && make -f Makefile.ci push_image_private_repo
+	@set -x && cd seldon-controller && make -f Makefile push_image_private_repo
 	@set -x && cd api-frontend && make -f Makefile.ci push_image_private_repo
 	@set -x && cd engine && make -f Makefile.ci push_image_private_repo
 
 .PHONY: clean
 clean:
-	cd cluster-manager && make -f Makefile.ci $@
 	cd api-frontend && make -f Makefile.ci $@
 	cd engine && make -f Makefile.ci clean $@
+	cd seldon-controller && make -f Makefile clean $@
 

components/outlier-detection/isolation-forest/isolation_forest.ipynb

@@ -169,8 +169,7 @@
    "outputs": [],
    "source": [
     "if MINIKUBE:\n",
-    "    !minikube start --memory 4096 --feature-gates=CustomResourceValidation=true \\\n",
-    "    --extra-config=apiserver.Authorization.Mode=RBAC\n",
+    "    !minikube start --memory 4096\n",
     "else:\n",
     "    !gcloud container clusters get-credentials standard-cluster-1 --zone europe-west1-b --project seldon-demos"
    ]
@@ -259,8 +258,14 @@
    },
    "outputs": [],
    "source": [
-    "!helm install ../../../helm-charts/seldon-core-crd --name seldon-core-crd \\\n",
-    "    --set usage_metrics.enabled=true"
+    "!helm install ../../../helm-charts/seldon-core-controller --name seldon-core --set usage_metrics.enabled=true --namespace seldon-system"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Check deployment rollout status for seldon core."
    ]
   },
   {
@@ -271,16 +276,23 @@
    },
    "outputs": [],
    "source": [
-    "!helm install ../../../helm-charts/seldon-core --name seldon-core \\\n",
-    "        --namespace seldon \\\n",
-    "        --set ambassador.enabled=true"
+    "!kubectl rollout status statefulset.apps/seldon-operator-controller-manager -n seldon-system"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Check deployment rollout status for seldon core."
+    "Install Ambassador API gateway"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "!helm install stable/ambassador --name ambassador --set image.tag=0.40.2"
    ]
   },
   {
@@ -289,8 +301,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!kubectl rollout status deploy/seldon-core-seldon-cluster-manager -n seldon\n",
-    "!kubectl rollout status deploy/seldon-core-seldon-apiserver -n seldon"
+    "!kubectl rollout status deployment.apps/ambassador"
    ]
   },
   {
@@ -436,7 +447,7 @@
    },
    "outputs": [],
    "source": [
-    "response = rest_request_ambassador(\"outlier-detector\",request,endpoint=\"localhost:8003\")"
+    "response = rest_request_ambassador(\"outlier-detector\",\"seldon\",request,endpoint=\"localhost:8003\")"
    ]
   },
   {
@@ -453,7 +464,7 @@
    "outputs": [],
    "source": [
     "if MODEL:\n",
-    "    send_feedback_rest(\"outlier-detector\",request,response,0,labels,endpoint=\"localhost:8003\")"
+    "    send_feedback_rest(\"outlier-detector\",\"seldon\",request,response,0,labels,endpoint=\"localhost:8003\")"
    ]
   },
   {
@@ -549,9 +560,9 @@
     "    fraction_outlier = .1\n",
     "    X, labels = generate_batch(data,samples,fraction_outlier)\n",
     "    request = get_payload(X)\n",
-    "    response = rest_request_ambassador(\"outlier-detector\",request,endpoint=\"localhost:8003\")\n",
+    "    response = rest_request_ambassador(\"outlier-detector\",\"seldon\",request,endpoint=\"localhost:8003\")\n",
     "    if MODEL:\n",
-    "        send_feedback_rest(\"outlier-detector\",request,response,0,labels,endpoint=\"localhost:8003\")\n",
+    "        send_feedback_rest(\"outlier-detector\",\"seldon\",request,response,0,labels,endpoint=\"localhost:8003\")\n",
     "    time.sleep(1)"
    ]
   },
@@ -589,7 +600,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.6"
+   "version": "3.7.3"
   }
  },
  "nbformat": 4,

components/outlier-detection/isolation-forest/utils.py

@@ -158,22 +158,22 @@ def get_payload(arr):
     payload = {"meta":{},"data":datadef}
     return payload
 
-def rest_request_ambassador(deploymentName,request,endpoint="localhost:8003"):
+def rest_request_ambassador(deploymentName,namespace,request,endpoint="localhost:8003"):
     response = requests.post(
-                "http://"+endpoint+"/seldon/"+deploymentName+"/api/v0.1/predictions",
+                "http://"+endpoint+"/seldon/"+namespace+"/"+deploymentName+"/api/v0.1/predictions",
                 json=request)
     print(response.status_code)
     print(response.text)
     return response.json()
 
-def send_feedback_rest(deploymentName,request,response,reward,truth,endpoint="localhost:8003"):
+def send_feedback_rest(deploymentName,namespace,request,response,reward,truth,endpoint="localhost:8003"):
     feedback = {
         "request": request,
         "response": response,
         "reward": reward,
         "truth": {"data":{"ndarray":truth.tolist()}}
     }
     ret = requests.post(
-         "http://"+endpoint+"/seldon/"+deploymentName+"/api/v0.1/feedback",
+         "http://"+endpoint+"/seldon/"+namespace+"/"+deploymentName+"/api/v0.1/feedback",
         json=feedback)
-    return
+    return

components/outlier-detection/mahalanobis/outlier_mahalanobis.ipynb

@@ -130,8 +130,7 @@
    "outputs": [],
    "source": [
     "if MINIKUBE:\n",
-    "    !minikube start --memory 4096 --feature-gates=CustomResourceValidation=true \\\n",
-    "    --extra-config=apiserver.Authorization.Mode=RBAC\n",
+    "    !minikube start --memory 4096 \n",
     "else:\n",
     "    !gcloud container clusters get-credentials standard-cluster-1 --zone europe-west1-b --project seldon-demos"
    ]
@@ -222,28 +221,39 @@
    },
    "outputs": [],
    "source": [
-    "!helm install ../../../helm-charts/seldon-core-crd --name seldon-core-crd \\\n",
-    "    --set usage_metrics.enabled=true"
+    "!helm install ../../../helm-charts/seldon-core-controller --name seldon-core --set usage_metrics.enabled=true --namespace seldon-system"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Check deployment rollout status for seldon core."
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "scrolled": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
-    "!helm install ../../../helm-charts/seldon-core --name seldon-core \\\n",
-    "        --namespace seldon \\\n",
-    "        --set ambassador.enabled=true"
+    "!kubectl rollout status statefulset.apps/seldon-operator-controller-manager -n seldon-system"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Check deployment rollout status for seldon core."
+    "Install Ambassador API gateway"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "!helm install stable/ambassador --name ambassador --set image.tag=0.40.2"
    ]
   },
   {
@@ -252,8 +262,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!kubectl rollout status deploy/seldon-core-seldon-cluster-manager -n seldon\n",
-    "!kubectl rollout status deploy/seldon-core-seldon-apiserver -n seldon"
+    "!kubectl rollout status deployment.apps/ambassador"
    ]
   },
   {
@@ -405,7 +414,7 @@
    },
    "outputs": [],
    "source": [
-    "response = rest_request_ambassador(\"outlier-detector\",request,endpoint=\"localhost:8003\")"
+    "response = rest_request_ambassador(\"outlier-detector\",\"seldon\",request,endpoint=\"localhost:8003\")"
    ]
   },
   {
@@ -422,7 +431,7 @@
    "outputs": [],
    "source": [
     "if MODEL:\n",
-    "    send_feedback_rest(\"outlier-detector\",request,response,0,labels,endpoint=\"localhost:8003\")"
+    "    send_feedback_rest(\"outlier-detector\",\"seldon\",request,response,0,labels,endpoint=\"localhost:8003\")"
    ]
   },
   {
@@ -520,9 +529,9 @@
     "    fraction_outlier = .1\n",
     "    X, labels = generate_batch(data,samples,fraction_outlier)\n",
     "    request = get_payload(X)\n",
-    "    response = rest_request_ambassador(\"outlier-detector\",request,endpoint=\"localhost:8003\")\n",
+    "    response = rest_request_ambassador(\"outlier-detector\",\"seldon\",request,endpoint=\"localhost:8003\")\n",
     "    if MODEL:\n",
-    "        send_feedback_rest(\"outlier-detector\",request,response,0,labels,endpoint=\"localhost:8003\")\n",
+    "        send_feedback_rest(\"outlier-detector\",\"seldon\",request,response,0,labels,endpoint=\"localhost:8003\")\n",
     "    time.sleep(1)"
    ]
   },
@@ -560,7 +569,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.6"
+   "version": "3.7.3"
   }
  },
  "nbformat": 4,

components/outlier-detection/mahalanobis/utils.py

@@ -150,22 +150,22 @@ def get_payload(arr):
     payload = {"meta":{},"data":datadef}
     return payload
 
-def rest_request_ambassador(deploymentName,request,endpoint="localhost:8003"):
+def rest_request_ambassador(deploymentName,namespace,request,endpoint="localhost:8003"):
     response = requests.post(
-                "http://"+endpoint+"/seldon/"+deploymentName+"/api/v0.1/predictions",
+                "http://"+endpoint+"/seldon/"+namespace+"/"+deploymentName+"/api/v0.1/predictions",
                 json=request)
     print(response.status_code)
     print(response.text)
     return response.json()
 
-def send_feedback_rest(deploymentName,request,response,reward,truth,endpoint="localhost:8003"):
+def send_feedback_rest(deploymentName,namespace,request,response,reward,truth,endpoint="localhost:8003"):
     feedback = {
         "request": request,
         "response": response,
         "reward": reward,
         "truth": {"data":{"ndarray":truth.tolist()}}
     }
     ret = requests.post(
-         "http://"+endpoint+"/seldon/"+deploymentName+"/api/v0.1/feedback",
+         "http://"+endpoint+"/seldon/"+namespace+"/"+deploymentName+"/api/v0.1/feedback",
         json=feedback)
-    return
+    return