Merge pull request #1 from SeldonIO/master

Update from upstream

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build-api-frontend:
     docker:
-      - image: seldonio/core-builder:0.1
+      - image: seldonio/core-builder:0.3
 
     working_directory: /work
 
@@ -21,7 +21,7 @@ jobs:
 
   build-engine:
     docker:
-      - image: seldonio/core-builder:0.1
+      - image: seldonio/core-builder:0.3
 
     working_directory: /work
 
@@ -40,7 +40,7 @@ jobs:
 
   cluster-manager:
     docker:
-      - image: seldonio/core-builder:0.1
+      - image: seldonio/core-builder:0.3
 
     working_directory: /work
 

.gitignore

@@ -124,3 +124,37 @@ engine/src/main/resources/static/seldon.json
 api-frontend/src/main/resources/static/seldon.json
 wrappers/python/seldon.json
 
+testing/notebooks/my-ml-deployment/
+testing/notebooks/my-model/
+testing/notebooks/proto/prediction.proto
+testing/notebooks/tensorflow/
+api-frontend/pom.xml.versionsBackup
+api-frontend/src/main/proto/tensorflow/
+cluster-manager/pom.xml.versionsBackup
+engine/pom.xml.versionsBackup
+engine/src/main/proto/tensorflow/
+
+seldon-core/seldon-core/json/template_0.2.yaml
+seldon-core/seldon-core/json/template_0.2_cluster_wide.yaml
+seldon-core/seldon-core/json/template_0.2_single_namespace.yaml
+openapi/prediction.grpcapi.proto
+openapi/prediction.grpcapi.swagger.json
+openapi/tensorflow/
+proto/tensorflow/tensorflow/
+
+util/loadtester/MNIST_data/
+
+# python build
+eggs/
+.eggs/
+*.egg-info/
+./pytest_cache
+
+examples/models/sagemaker/sagemaker-scikit-learn-container
+examples/models/sagemaker/aws-config-secret.yaml
+examples/models/sagemaker/scikit_learn_iris_code.tar.gz
+examples/models/sagemaker/scikit_learn_iris_deployment.json
+
+#go example
+examples/wrappers/go/.idea
+

.gitlab-ci.yml

@@ -11,7 +11,7 @@ stages:
   - deploy
 
 cluster-manager-maven-build:
-  image: seldonio/core-builder:0.1
+  image: seldonio/core-builder:0.3
   stage: build
   script:
     - cd cluster-manager
@@ -26,7 +26,7 @@ cluster-manager-maven-build:
     - release-0.1
 
 engine-maven-build:
-  image: seldonio/core-builder:0.1
+  image: seldonio/core-builder:0.3
   stage: build
   script:
     - cd engine
@@ -41,7 +41,7 @@ engine-maven-build:
     - release-0.1
 
 api-frontend-maven-build:
-  image: seldonio/core-builder:0.1
+  image: seldonio/core-builder:0.3
   stage: build
   script:
     - cd api-frontend

.travis.yml

@@ -17,7 +17,7 @@ jobs:
           -v /var/run/docker.sock:/var/run/docker.sock \
           -v ${HOME}/.m2:/root/.m2 \
           -v $(pwd):/work \
-          seldonio/core-builder:0.2 bash -c 'cd api-frontend && make -f Makefile.ci build'
+          seldonio/core-builder:0.3 bash -c 'cd api-frontend && make -f Makefile.ci build'
     - docker images | grep 'seldonio/apife'
   - script:
     - echo Building engine
@@ -27,7 +27,7 @@ jobs:
           -v /var/run/docker.sock:/var/run/docker.sock \
           -v ${HOME}/.m2:/root/.m2 \
           -v $(pwd):/work \
-          seldonio/core-builder:0.2 bash -c 'cd engine && make -f Makefile.ci build'
+          seldonio/core-builder:0.3 bash -c 'cd engine && make -f Makefile.ci build'
     - docker images | grep 'seldonio/engine'
   - script:
     - echo Building cluster-manager
@@ -37,7 +37,7 @@ jobs:
           -v /var/run/docker.sock:/var/run/docker.sock \
           -v ${HOME}/.m2:/root/.m2 \
           -v $(pwd):/work \
-          seldonio/core-builder:0.2 bash -c 'cd cluster-manager && make -f Makefile.ci build'
+          seldonio/core-builder:0.3 bash -c 'cd cluster-manager && make -f Makefile.ci build'
     - docker images | grep 'seldonio/cluster-manager'
 
 notifications:

CHANGELOG.md

@@ -1,5 +1,59 @@
 # Change Log
 
+## [v0.2.5](https://github.com/SeldonIO/seldon-core/tree/v0.2.5) (2018-12-16)
+[Full Changelog](https://github.com/SeldonIO/seldon-core/compare/v0.2.4...v0.2.5)
+
+**Closed issues:**
+
+- initialDelaySeconds: 10 sec is not enough for some models [\#323](https://github.com/SeldonIO/seldon-core/issues/323)
+- Bug: custom metrics for both children and parent components [\#322](https://github.com/SeldonIO/seldon-core/issues/322)
+- Ambassador seldon deployment not registered [\#318](https://github.com/SeldonIO/seldon-core/issues/318)
+- Allow user to disable Redis in seldon-core helm chart [\#304](https://github.com/SeldonIO/seldon-core/issues/304)
+- grpc tensor convert not valid for python 2 [\#301](https://github.com/SeldonIO/seldon-core/issues/301)
+- Ambassador  [\#298](https://github.com/SeldonIO/seldon-core/issues/298)
+- Create a python wrapper for COMBINER components [\#296](https://github.com/SeldonIO/seldon-core/issues/296)
+- packaging for python microservice wrapper [\#293](https://github.com/SeldonIO/seldon-core/issues/293)
+- Update to latest Spartakus image [\#291](https://github.com/SeldonIO/seldon-core/issues/291)
+- Docker image "seldonio/seldon-core-s2i-python3" uses old Python 3.6 [\#288](https://github.com/SeldonIO/seldon-core/issues/288)
+- Seldon cluster-manager  k8s cluster wide operations [\#269](https://github.com/SeldonIO/seldon-core/issues/269)
+- S2I hangs in example models when using minikube docker-env [\#253](https://github.com/SeldonIO/seldon-core/issues/253)
+- Accessing custom metrics in our Python model [\#245](https://github.com/SeldonIO/seldon-core/issues/245)
+- strData & binData not accepted by Python model microservice [\#225](https://github.com/SeldonIO/seldon-core/issues/225)
+- Utilize latest /status endpoint for Custom Resources in k8s 1.11 [\#176](https://github.com/SeldonIO/seldon-core/issues/176)
+- Investigate Nvidia's TensorRT [\#121](https://github.com/SeldonIO/seldon-core/issues/121)
+- Review status field for CRD [\#83](https://github.com/SeldonIO/seldon-core/issues/83)
+- gitops demo [\#67](https://github.com/SeldonIO/seldon-core/issues/67)
+- Update seldon-core/examples docs after move [\#35](https://github.com/SeldonIO/seldon-core/issues/35)
+- Create wrapper for Spark standalone runtime models [\#24](https://github.com/SeldonIO/seldon-core/issues/24)
+
+**Merged pull requests:**
+
+- Update e2e tests and add Combiner to python wrappers [\#343](https://github.com/SeldonIO/seldon-core/pull/343) ([cliveseldon](https://github.com/cliveseldon))
+- Python wrapper update and openvino example [\#342](https://github.com/SeldonIO/seldon-core/pull/342) ([cliveseldon](https://github.com/cliveseldon))
+- Remove legacy python wrapper modules [\#339](https://github.com/SeldonIO/seldon-core/pull/339) ([jklaise](https://github.com/jklaise))
+- Update S2I version in examples [\#338](https://github.com/SeldonIO/seldon-core/pull/338) ([cliveseldon](https://github.com/cliveseldon))
+- Cluster Wide Operator [\#334](https://github.com/SeldonIO/seldon-core/pull/334) ([cliveseldon](https://github.com/cliveseldon))
+- update python requests package version [\#331](https://github.com/SeldonIO/seldon-core/pull/331) ([arnaudvl](https://github.com/arnaudvl))
+- Fix bug in parent custom metrics [\#329](https://github.com/SeldonIO/seldon-core/pull/329) ([cliveseldon](https://github.com/cliveseldon))
+- ResNet Latency test [\#328](https://github.com/SeldonIO/seldon-core/pull/328) ([cliveseldon](https://github.com/cliveseldon))
+- adding isolation forest and reorganize vae [\#327](https://github.com/SeldonIO/seldon-core/pull/327) ([arnaudvl](https://github.com/arnaudvl))
+- Add serving doc [\#326](https://github.com/SeldonIO/seldon-core/pull/326) ([cliveseldon](https://github.com/cliveseldon))
+- Update docs for API examples and latest protos [\#325](https://github.com/SeldonIO/seldon-core/pull/325) ([cliveseldon](https://github.com/cliveseldon))
+- Allow further options for binary and tensors in prediction API [\#321](https://github.com/SeldonIO/seldon-core/pull/321) ([cliveseldon](https://github.com/cliveseldon))
+- outlier detection component [\#320](https://github.com/SeldonIO/seldon-core/pull/320) ([arnaudvl](https://github.com/arnaudvl))
+- Fix grpc tensor convert for python2 [\#317](https://github.com/SeldonIO/seldon-core/pull/317) ([cliveseldon](https://github.com/cliveseldon))
+- Fix bug in parsing truth values for feedback [\#316](https://github.com/SeldonIO/seldon-core/pull/316) ([jklaise](https://github.com/jklaise))
+- WIP: Custom metric tags [\#311](https://github.com/SeldonIO/seldon-core/pull/311) ([cliveseldon](https://github.com/cliveseldon))
+- Fix tester docs to point to correct links [\#307](https://github.com/SeldonIO/seldon-core/pull/307) ([jklaise](https://github.com/jklaise))
+- Create initial Python package [\#306](https://github.com/SeldonIO/seldon-core/pull/306) ([jklaise](https://github.com/jklaise))
+- Allow disable redis [\#305](https://github.com/SeldonIO/seldon-core/pull/305) ([ChenyuanZ](https://github.com/ChenyuanZ))
+- fix status remove functionality in operator [\#300](https://github.com/SeldonIO/seldon-core/pull/300) ([cliveseldon](https://github.com/cliveseldon))
+- Fix storing of Gauge metrics [\#299](https://github.com/SeldonIO/seldon-core/pull/299) ([cliveseldon](https://github.com/cliveseldon))
+- Rolling Update Fixes [\#295](https://github.com/SeldonIO/seldon-core/pull/295) ([cliveseldon](https://github.com/cliveseldon))
+- Update java base images [\#292](https://github.com/SeldonIO/seldon-core/pull/292) ([cliveseldon](https://github.com/cliveseldon))
+- WIP: Create python 3.6 and 3.7 wrapper versions [\#290](https://github.com/SeldonIO/seldon-core/pull/290) ([cliveseldon](https://github.com/cliveseldon))
+- Custom Metrics [\#281](https://github.com/SeldonIO/seldon-core/pull/281) ([cliveseldon](https://github.com/cliveseldon))
+
 ## [v0.2.4](https://github.com/SeldonIO/seldon-core/tree/v0.2.4) (2018-11-07)
 [Full Changelog](https://github.com/SeldonIO/seldon-core/compare/v0.2.3...v0.2.4)
 

Jenkinsfile

@@ -7,7 +7,7 @@ pipeline {
     }
     agent {
         docker {
-            image 'seldonio/core-builder:0.1'
+            image 'seldonio/core-builder:0.3'
             args '-v /root/.m2:/root/.m2'
         }
     }

Makefile

@@ -28,7 +28,7 @@ run_core_builder_in_host:
 			-v /var/run/docker.sock:/var/run/docker.sock \
 			-v $${HOME}/.m2:/root/.m2 \
 			-v $(SELDON_CORE_LOCAL_DIR):/work \
-			seldonio/core-builder:0.1 bash
+			seldonio/core-builder:0.3 bash
 
 
 run_core_builder_in_minikube:
@@ -37,7 +37,7 @@ run_core_builder_in_minikube:
 			-v /var/run/docker.sock:/var/run/docker.sock \
 			-v /home/docker/.m2:/root/.m2 \
 			-v $(SELDON_CORE_VM_DIR):/work \
-			seldonio/core-builder:0.1 bash
+			seldonio/core-builder:0.3 bash
 
 show_paths:
 	@echo "local: $(SELDON_CORE_LOCAL_DIR)"

api-frontend/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:8u171-jre-alpine3.7
+FROM openjdk:8u181-jre-alpine3.8
 
 ARG APP_VERSION=UNKOWN_VERSION
 

api-frontend/Makefile

@@ -47,6 +47,7 @@ update_proto:
 	cp -v ../proto/prediction.proto src/main/proto/ 
 	cp -vr ../proto/k8s/k8s.io src/main/proto
 	cp -v ../proto/k8s/v1.proto src/main/proto
+	cp -vr ../proto/tensorflow/tensorflow src/main/proto
 
 port_forward_api_server:
 	POD_NAME=$$(kubectl --namespace default get pod -l app=seldon-apiserver-container-app -o template --template="{{(index .items 0).metadata.name}}") && \

api-frontend/Makefile.ci

@@ -38,14 +38,18 @@ clean:
 	rm -fvr src/main/proto/k8s.io
 	rm -fv src/main/proto/v1.proto
 
-download_protos:
+download_protos_k8s:
 	cd ../proto/k8s ; make create_protos
 
-update_proto: download_protos
+download_protos_tensorflow:
+	cd ../proto/tensorflow ; make create_protos
+
+update_proto: download_protos_k8s download_protos_tensorflow
 	cp -v ../proto/seldon_deployment.proto src/main/proto/
 	cp -v ../proto/prediction.proto src/main/proto/
 	cp -vr ../proto/k8s/k8s.io src/main/proto
 	cp -v ../proto/k8s/v1.proto src/main/proto
-
+	cp -vr ../proto/tensorflow/tensorflow src/main/proto
+
 update_swagger:
 	cp -v ../openapi/apife.oas3.json src/main/resources/static/seldon.json

api-frontend/build-private-repo

@@ -12,5 +12,5 @@ docker run --rm -it \
     -v /var/run/docker.sock:/var/run/docker.sock \
     -v $HOME/.m2:/root/.m2 \
     -v $PWD:/work \
-    seldonio/core-builder:0.1 bash -c 'cd api-frontend && make -f Makefile.ci build'
+    seldonio/core-builder:0.3 bash -c 'cd api-frontend && make -f Makefile.ci build'
 

api-frontend/pom.xml

@@ -10,7 +10,7 @@
 
 	<groupId>io.seldon.apife</groupId>
 	<artifactId>seldon-apife</artifactId>
-	<version>0.2.5-SNAPSHOT</version>
+	<version>0.2.6-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>api-frontend</name>
@@ -39,6 +39,14 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.8.2</version>
+                <configuration>
+       				<excludes>
+            			<exclude>**/generated-sources/**/*.class</exclude>
+            			<exclude>**/io/kubernetes/**/*.class</exclude>
+            			<exclude>**/io/seldon/protos/**/*.class</exclude>
+            			<exclude>**/org/tensorflow/framework/**/*.class</exclude>
+        			</excludes>
+    			</configuration>
                 <executions>
                     <execution>
                         <id>jacoco-initialize</id>
@@ -154,6 +162,30 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+	<dependency>
+		<groupId>javax.xml.bind</groupId>
+		<artifactId>jaxb-api</artifactId>
+		<version>2.3.0</version>
+		<scope>test</scope>
+	</dependency>
+	<dependency>
+		<groupId>com.sun.xml.bind</groupId>
+		<artifactId>jaxb-core</artifactId>
+		<version>2.3.0</version>
+		<scope>test</scope>
+	</dependency>
+	<dependency>
+		<groupId>com.sun.xml.bind</groupId>
+		<artifactId>jaxb-impl</artifactId>
+		<version>2.3.0</version>
+		<scope>test</scope>
+	</dependency>
+	<dependency>
+		<groupId>javax.activation</groupId>
+		<artifactId>activation</artifactId>
+		<version>1.1.1</version>
+		<scope>test</scope>
+	</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jdbc</artifactId>

api-frontend/push-private-repo

@@ -13,5 +13,5 @@ docker run --rm -it \
     -v /var/run/docker.sock:/var/run/docker.sock \
     -v $HOME/.m2:/root/.m2 \
     -v $PWD:/work \
-    seldonio/core-builder:0.1 bash -c 'cd api-frontend && make -f Makefile.ci push_image_private_repo'
+    seldonio/core-builder:0.3 bash -c 'cd api-frontend && make -f Makefile.ci push_image_private_repo'
 

api-frontend/src/main/java/io/seldon/apife/AppProperties.java

@@ -23,6 +23,7 @@ public class AppProperties {
     private int engineContainerPort;
     private int engineGrpcContainerPort;
     private String namespace;
+    private boolean singleNamespace = true;
 
     public int getEngineContainerPort() {
         return engineContainerPort;
@@ -43,7 +44,14 @@ public String getNamespace() {
     public void setNamespace(String namespace) {
         this.namespace = namespace;
     }
-    @Override
+
+    public boolean isSingleNamespace() {
+		return singleNamespace;
+	}
+	public void setSingleNamespace(boolean singleNamespace) {
+		this.singleNamespace = singleNamespace;
+	}
+	@Override
     public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }