Part of bug fix

PaddleFlow · Jan 14, 2021 · e7ba05b · e7ba05b
1 parent a0fc4d6
commit e7ba05b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/config/configmap/configmap.yaml b/config/configmap/configmap.yaml
@@ -12,6 +12,6 @@ data:
     }
   ingress: |-
     {
-        "ingressGateway": "paddleflow/paddleflow-gateway",
-        "ingressServiceName": "*"
+        "ingressGateway" : "istio-ingressgateway",
+        "ingressServiceName" : "istio-ingressgateway.istio-system.svc.cluster.local"
     }
diff --git a/config/samples/elasticserving_v1_paddle.yaml b/config/samples/elasticserving_v1_paddle.yaml
@@ -10,5 +10,4 @@ spec:
   runtimeVersion: paddleserving
   service:
     minScale: 1
-  # storageUri: nginx:latest
-  # runtimeVersion: nginx
+    concurrency: "cpu"
diff --git a/pkg/controllers/elasticserving/resources/istio/virtualservice.go b/pkg/controllers/elasticserving/resources/istio/virtualservice.go
@@ -2,6 +2,7 @@ package istio
 
 import (
 	elasticservingv1 "ElasticServing/pkg/apis/elasticserving/v1"
+	"ElasticServing/pkg/constants"
 	"fmt"
 
 	istiov1alpha3 "istio.io/api/networking/v1alpha3"
@@ -31,15 +32,20 @@ func NewVirtualServiceBuilder(configMap *core.ConfigMap) *VirtualServiceBuilder
 	ingressConfig.IngressGateway = istioIngressConfig.IngressGateway
 	ingressConfig.IngressServiceName = istioIngressConfig.IngressServiceName
 
+	if ingressConfig.IngressGateway == "" || ingressConfig.IngressServiceName == "" {
+		panic(fmt.Errorf("Invalid ingress config, ingressGateway and ingressService are required."))
+	}
+
 	return &VirtualServiceBuilder{ingressConfig: ingressConfig}
 }
 
 func (r *VirtualServiceBuilder) CreateVirtualService(paddlesvc *elasticservingv1.PaddleService) *v1alpha3.VirtualService {
-	clusterDomain := "cluster.local"
+	// clusterDomain := "cluster.local"
 	prefix := fmt.Sprintf("/paddlepaddle/%s/%s/", paddlesvc.Namespace, paddlesvc.Name)
 	rewrite := fmt.Sprintf("/paddlepaddle/%s/%s/", paddlesvc.Namespace, paddlesvc.Name)
 
-	service := fmt.Sprintf("%s.%s.svc.%s", paddlesvc.ObjectMeta.Name, paddlesvc.ObjectMeta.Namespace, clusterDomain)
+	// service := fmt.Sprintf("%s.%s.svc.%s", paddlesvc.Name, paddlesvc.Namespace, clusterDomain)
+	service := constants.DefaultServiceName(paddlesvc.Name)
 
 	istioGateway := r.ingressConfig.IngressGateway
 	host := r.ingressConfig.IngressServiceName
@@ -50,10 +56,10 @@ func (r *VirtualServiceBuilder) CreateVirtualService(paddlesvc *elasticservingv1
 			Kind:       "VirtualService",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name:        paddlesvc.ObjectMeta.Name,
-			Namespace:   paddlesvc.ObjectMeta.Namespace,
-			Labels:      paddlesvc.ObjectMeta.Labels,
-			Annotations: paddlesvc.ObjectMeta.Annotations,
+			Name:        paddlesvc.Name,
+			Namespace:   paddlesvc.Namespace,
+			Labels:      paddlesvc.Labels,
+			Annotations: paddlesvc.Annotations,
 		},
 		Spec: istiov1alpha3.VirtualService{
 			Hosts:    []string{host},

diff --git a/pkg/controllers/elasticserving/resources/knative/service.go b/pkg/controllers/elasticserving/resources/knative/service.go
@@ -61,7 +61,6 @@ func (r *ServiceBuilder) CreateService(serviceName string, paddlesvc *elasticser
 		tar -xzf uci_housing.tar.gz &&
 		python -m paddle_serving_server.serve --model uci_housing_model --thread 1 --port 9292`,
 	}
-
 	service := &knservingv1.Service{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      serviceName,