test updates for cluster wide and single namespace notebooks

SeldonIO · Dec 7, 2018 · 05a8729 · 05a8729
1 parent 51ba6f7
commit 05a8729
Show file tree

Hide file tree

Showing 7 changed files with 1,111 additions and 2,926 deletions.
diff --git a/api-frontend/src/main/java/io/seldon/apife/grpc/SeldonGrpcServer.java b/api-frontend/src/main/java/io/seldon/apife/grpc/SeldonGrpcServer.java
@@ -38,6 +38,7 @@
 import io.seldon.apife.deployments.DeploymentStore;
 import io.seldon.apife.deployments.DeploymentsHandler;
 import io.seldon.apife.exception.SeldonAPIException;
+import io.seldon.apife.k8s.KubernetesUtil;
 import io.seldon.protos.DeploymentProtos.SeldonDeployment;
 
 @Component
@@ -63,6 +64,7 @@ public class SeldonGrpcServer    {
     public static final int TIMEOUT = 5;
     private int maxMessageSize = io.grpc.internal.GrpcUtil.DEFAULT_MAX_MESSAGE_SIZE;
     private int grpcReadTimeout = DEFAULT_GRPC_READ_TIMEOUT;
+    private final KubernetesUtil k8sUtil = new KubernetesUtil();
 
     @Autowired
     public SeldonGrpcServer(AppProperties appProperties,DeploymentStore deploymentStore,TokenStore tokenStore,DeploymentsHandler deploymentsHandler,AnnotationsConfig annotations)
@@ -207,8 +209,13 @@ private void blockUntilShutdown() throws InterruptedException {
     }
 
     public void deploymentAdded(SeldonDeployment resource) {
-        ManagedChannel channel = ManagedChannelBuilder.forAddress(resource.getSpec().getName(), appProperties.getEngineGrpcContainerPort()).usePlaintext(true).build();
-        channelStore.put(resource.getSpec().getOauthKey(),channel);        
+    	final String namespace = k8sUtil.getNamespace(resource);
+    	final String endpoint = resource.getSpec().getName() + "." + namespace; 
+        final ManagedChannel channel = ManagedChannelBuilder.forAddress(endpoint, appProperties.getEngineGrpcContainerPort()).usePlaintext(true).build();
+        if (appProperties.isSingleNamespace())
+        	channelStore.put(resource.getSpec().getOauthKey(),channel);
+        final String namespacedKey = resource.getSpec().getOauthKey() + namespace;
+        channelStore.put(namespacedKey,channel);
     }
 
     public void deploymentRemoved(SeldonDeployment resource) {

diff --git a/api-frontend/src/main/java/io/seldon/apife/k8s/KubernetesUtil.java b/api-frontend/src/main/java/io/seldon/apife/k8s/KubernetesUtil.java
@@ -0,0 +1,17 @@
+package io.seldon.apife.k8s;
+
+import org.apache.commons.lang3.StringUtils;
+
+import io.seldon.protos.DeploymentProtos.SeldonDeployment;
+
+public class KubernetesUtil {
+
+	public String getNamespace(SeldonDeployment d)
+	 {
+		 if (StringUtils.isEmpty(d.getMetadata().getNamespace()))
+			 return "default";
+		 else
+			 return d.getMetadata().getNamespace();
+	 }
+
+}