enable global ambassador

SeldonIO · Nov 2, 2018 · 66f7b91 · 66f7b91
1 parent 0589106
commit 66f7b91
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/cluster-manager/src/main/java/io/seldon/clustermanager/k8s/SeldonDeploymentOperatorImpl.java b/cluster-manager/src/main/java/io/seldon/clustermanager/k8s/SeldonDeploymentOperatorImpl.java
@@ -25,6 +25,7 @@
 import java.util.StringJoiner;
 
 import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -499,12 +500,14 @@ private OwnerReference getOwnerReference(SeldonDeployment mlDep)
 
 	private String getAmbassadorAnnotation(SeldonDeployment mlDep,String serviceName)
 	{
+		String namespace = (StringUtils.isEmpty(mlDep.getMetadata().getNamespace())) ? "default" : mlDep.getMetadata().getNamespace();
+
         final String restMapping = "---\n"+
                 "apiVersion: ambassador/v0\n" +
                 "kind:  Mapping\n" +
                 "name:  seldon_"+mlDep.getMetadata().getName()+"_rest_mapping\n" +
                 "prefix: /seldon/"+mlDep.getMetadata().getName()+"/\n" +
-                "service: "+serviceName+":"+clusterManagerProperites.getEngineContainerPort()+"\n" +
+                "service: "+serviceName+"."+namespace+":"+clusterManagerProperites.getEngineContainerPort()+"\n" +
                 "timeout_ms: " + mlDep.getSpec().getAnnotationsOrDefault(Constants.REST_READ_TIMEOUT_ANNOTATION, "3000") + "\n";
         final String grpcMapping = "---\n"+
                 "apiVersion: ambassador/v0\n" +
@@ -515,7 +518,7 @@ private String getAmbassadorAnnotation(SeldonDeployment mlDep,String serviceName
                 "rewrite: /seldon.protos.Seldon/\n" + 
                 "headers:\n"+
                  "  seldon: "+mlDep.getMetadata().getName() + "\n" +
-                "service: "+serviceName+":"+clusterManagerProperites.getEngineGrpcContainerPort()+"\n" +
+                "service: "+serviceName+"."+namespace+":"+clusterManagerProperites.getEngineGrpcContainerPort()+"\n" +
                 "timeout_ms: " + mlDep.getSpec().getAnnotationsOrDefault(Constants.GRPC_READ_TIMEOUT_ANNOTATION, "3000") + "\n";
 	    return restMapping + grpcMapping;
 	}