added a flag to make istio optional

Signed-off-by: Suresh Nakkeran <suresh.n@ideas2it.com>
kserve · Aug 16, 2022 · bc21ef6 · bc21ef6
1 parent 5b00d22
commit bc21ef6
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 44 deletions.
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -117,17 +117,23 @@ func main() {
 		log.Error(err, "unable to get deploy config.")
 		os.Exit(1)
 	}
+	ingressConfig, err := v1beta1.NewIngressConfig(client)
+	if err != nil {
+		log.Error(err, "unable to get ingress config.")
+		os.Exit(1)
+	}
 	if deployConfig.DefaultDeploymentMode == string(constants.Serverless) {
 		log.Info("Setting up Knative scheme")
 		if err := knservingv1.AddToScheme(mgr.GetScheme()); err != nil {
 			log.Error(err, "unable to add Knative APIs to scheme")
 			os.Exit(1)
 		}
-
-		log.Info("Setting up Istio schemes")
-		if err := v1alpha3.AddToScheme(mgr.GetScheme()); err != nil {
-			log.Error(err, "unable to add Istio v1alpha3 APIs to scheme")
-			os.Exit(1)
+		if ingressConfig.DisableIstioVirtualHost == false {
+			log.Info("Setting up Istio schemes")
+			if err := v1alpha3.AddToScheme(mgr.GetScheme()); err != nil {
+				log.Error(err, "unable to add Istio v1alpha3 APIs to scheme")
+				os.Exit(1)
+			}
 		}
 	}
 
@@ -152,7 +158,7 @@ func main() {
 		Scheme: mgr.GetScheme(),
 		Recorder: eventBroadcaster.NewRecorder(
 			mgr.GetScheme(), v1.EventSource{Component: "v1beta1Controllers"}),
-	}).SetupWithManager(mgr, deployConfig); err != nil {
+	}).SetupWithManager(mgr, deployConfig, ingressConfig.DisableIstioVirtualHost); err != nil {
 		setupLog.Error(err, "unable to create controller", "v1beta1Controller", "InferenceService")
 		os.Exit(1)
 	}

diff --git a/config/configmap/inferenceservice.yaml b/config/configmap/inferenceservice.yaml
@@ -162,7 +162,8 @@ data:
         "ingressDomain"  : "example.com",
         "ingressClassName" : "istio",
         "domainTemplate": "{{ .Name }}-{{ .Namespace }}.{{ .IngressDomain }}",
-        "urlScheme": "http"
+        "urlScheme": "http",
+        "disableIstioVirtualHost": false
     }
   logger: |-
     {

diff --git a/pkg/apis/serving/v1beta1/configmap.go b/pkg/apis/serving/v1beta1/configmap.go
@@ -127,6 +127,7 @@ type IngressConfig struct {
 	IngressClassName        *string `json:"ingressClassName,omitempty"`
 	DomainTemplate          string  `json:"domainTemplate,omitempty"`
 	UrlScheme               string  `json:"urlScheme,omitempty"`
+	DisableIstioVirtualHost bool    `json:"disableIstioVirtualHost,omitempty"`
 }
 
 // +kubebuilder:object:generate=false

diff --git a/pkg/controller/v1beta1/inferenceservice/controller.go b/pkg/controller/v1beta1/inferenceservice/controller.go
@@ -205,7 +205,7 @@ func (r *InferenceServiceReconciler) Reconcile(ctx context.Context, req ctrl.Req
 	} else {
 		reconciler := ingress.NewIngressReconciler(r.Client, r.Scheme, ingressConfig)
 		r.Log.Info("Reconciling ingress for inference service", "isvc", isvc.Name)
-		if err := reconciler.Reconcile(isvc); err != nil {
+		if err := reconciler.Reconcile(isvc, ingressConfig.DisableIstioVirtualHost); err != nil {
 			return reconcile.Result{}, errors.Wrapf(err, "fails to reconcile ingress")
 		}
 	}
@@ -274,19 +274,25 @@ func inferenceServiceStatusEqual(s1, s2 v1beta1api.InferenceServiceStatus, deplo
 	return equality.Semantic.DeepEqual(s1, s2)
 }
 
-func (r *InferenceServiceReconciler) SetupWithManager(mgr ctrl.Manager, deployConfig *v1beta1api.DeployConfig) error {
+func (r *InferenceServiceReconciler) SetupWithManager(mgr ctrl.Manager, deployConfig *v1beta1api.DeployConfig, disableIstioVirtualHost bool) error {
 	if deployConfig.DefaultDeploymentMode == string(constants.RawDeployment) {
 		return ctrl.NewControllerManagedBy(mgr).
 			For(&v1beta1api.InferenceService{}).
 			Owns(&appsv1.Deployment{}).
 			Complete(r)
-	} else {
+	} else if disableIstioVirtualHost == false {
 		return ctrl.NewControllerManagedBy(mgr).
 			For(&v1beta1api.InferenceService{}).
 			Owns(&knservingv1.Service{}).
 			Owns(&v1alpha3.VirtualService{}).
 			Owns(&appsv1.Deployment{}).
 			Complete(r)
+	} else {
+		return ctrl.NewControllerManagedBy(mgr).
+			For(&v1beta1api.InferenceService{}).
+			Owns(&knservingv1.Service{}).
+			Owns(&appsv1.Deployment{}).
+			Complete(r)
 	}
 
 }

diff --git a/pkg/controller/v1beta1/inferenceservice/reconcilers/ingress/ingress_reconciler.go b/pkg/controller/v1beta1/inferenceservice/reconcilers/ingress/ingress_reconciler.go
@@ -89,7 +89,7 @@ func getServiceHost(isvc *v1beta1.InferenceService) string {
 	}
 }
 
-func getServiceUrl(isvc *v1beta1.InferenceService, urlScheme string) string {
+func getServiceUrl(isvc *v1beta1.InferenceService, urlScheme string, disableIstioVirtualHost bool) string {
 	if isvc.Status.Components == nil {
 		return ""
 	}
@@ -102,7 +102,11 @@ func getServiceUrl(isvc *v1beta1.InferenceService, urlScheme string) string {
 		} else {
 			url := transformerStatus.URL
 			url.Scheme = urlScheme
-			return strings.Replace(url.String(), fmt.Sprintf("-%s-default", string(constants.Transformer)), "", 1)
+			if disableIstioVirtualHost == false {
+				return strings.Replace(url.String(), fmt.Sprintf("-%s-default", string(constants.Transformer)), "", 1)
+			} else {
+				return url.String()
+			}
 		}
 	}
 
@@ -113,7 +117,11 @@ func getServiceUrl(isvc *v1beta1.InferenceService, urlScheme string) string {
 	} else {
 		url := predictorStatus.URL
 		url.Scheme = urlScheme
-		return strings.Replace(url.String(), fmt.Sprintf("-%s-default", string(constants.Predictor)), "", 1)
+		if disableIstioVirtualHost == false {
+			return strings.Replace(url.String(), fmt.Sprintf("-%s-default", string(constants.Predictor)), "", 1)
+		} else {
+			return url.String()
+		}
 	}
 }
 
@@ -323,46 +331,49 @@ func createIngress(isvc *v1beta1.InferenceService, config *v1beta1.IngressConfig
 	return desiredIngress
 }
 
-func (ir *IngressReconciler) Reconcile(isvc *v1beta1.InferenceService) error {
+func (ir *IngressReconciler) Reconcile(isvc *v1beta1.InferenceService, disableIstioVirtualHost bool) error {
 	serviceHost := getServiceHost(isvc)
-	serviceUrl := getServiceUrl(isvc, ir.ingressConfig.UrlScheme)
+	serviceUrl := getServiceUrl(isvc, ir.ingressConfig.UrlScheme, disableIstioVirtualHost)
 	if serviceHost == "" || serviceUrl == "" {
 		return nil
 	}
-	//Create ingress
-	desiredIngress := createIngress(isvc, ir.ingressConfig)
-	if desiredIngress == nil {
-		return nil
-	}
+	// When Istio virtual host is disabled, we return the underlying component url.
+	// When Istio virtual host is enabled. we return the url using inference service virtual host name and redirect to the corresponding transformer, predictor or explainer url.
+	if disableIstioVirtualHost == false {
+		desiredIngress := createIngress(isvc, ir.ingressConfig)
+		if desiredIngress == nil {
+			return nil
+		}
 
-	//Create external service which points to local gateway
-	if err := ir.reconcileExternalService(isvc, ir.ingressConfig); err != nil {
-		return errors.Wrapf(err, "fails to reconcile external name service")
-	}
+		//Create external service which points to local gateway
+		if err := ir.reconcileExternalService(isvc, ir.ingressConfig); err != nil {
+			return errors.Wrapf(err, "fails to reconcile external name service")
+		}
 
-	if err := controllerutil.SetControllerReference(isvc, desiredIngress, ir.scheme); err != nil {
-		return errors.Wrapf(err, "fails to set owner reference for ingress")
-	}
+		if err := controllerutil.SetControllerReference(isvc, desiredIngress, ir.scheme); err != nil {
+			return errors.Wrapf(err, "fails to set owner reference for ingress")
+		}
 
-	existing := &v1alpha3.VirtualService{}
-	err := ir.client.Get(context.TODO(), types.NamespacedName{Name: desiredIngress.Name, Namespace: desiredIngress.Namespace}, existing)
-	if err != nil {
-		if apierr.IsNotFound(err) {
-			log.Info("Creating Ingress for isvc", "namespace", desiredIngress.Namespace, "name", desiredIngress.Name)
-			err = ir.client.Create(context.TODO(), desiredIngress)
+		existing := &v1alpha3.VirtualService{}
+		err := ir.client.Get(context.TODO(), types.NamespacedName{Name: desiredIngress.Name, Namespace: desiredIngress.Namespace}, existing)
+		if err != nil {
+			if apierr.IsNotFound(err) {
+				log.Info("Creating Ingress for isvc", "namespace", desiredIngress.Namespace, "name", desiredIngress.Name)
+				err = ir.client.Create(context.TODO(), desiredIngress)
+			}
+		} else {
+			if !routeSemanticEquals(desiredIngress, existing) {
+				existing.Spec = desiredIngress.Spec
+				existing.Annotations = desiredIngress.Annotations
+				existing.Labels = desiredIngress.Labels
+				log.Info("Update Ingress for isvc", "namespace", desiredIngress.Namespace, "name", desiredIngress.Name)
+				err = ir.client.Update(context.TODO(), existing)
+			}
 		}
-	} else {
-		if !routeSemanticEquals(desiredIngress, existing) {
-			existing.Spec = desiredIngress.Spec
-			existing.Annotations = desiredIngress.Annotations
-			existing.Labels = desiredIngress.Labels
-			log.Info("Update Ingress for isvc", "namespace", desiredIngress.Namespace, "name", desiredIngress.Name)
-			err = ir.client.Update(context.TODO(), existing)
+		if err != nil {
+			return errors.Wrapf(err, "fails to create or update ingress")
 		}
 	}
-	if err != nil {
-		return errors.Wrapf(err, "fails to create or update ingress")
-	}
 
 	if url, err := apis.ParseURL(serviceUrl); err == nil {
 		isvc.Status.URL = url

diff --git a/pkg/controller/v1beta1/inferenceservice/suite_test.go b/pkg/controller/v1beta1/inferenceservice/suite_test.go
@@ -100,7 +100,7 @@ var _ = BeforeSuite(func() {
 		Scheme:   k8sClient.Scheme(),
 		Log:      ctrl.Log.WithName("V1beta1InferenceServiceController"),
 		Recorder: k8sManager.GetEventRecorderFor("V1beta1InferenceServiceController"),
-	}).SetupWithManager(k8sManager, deployConfig)
+	}).SetupWithManager(k8sManager, deployConfig, false)
 	Expect(err).ToNot(HaveOccurred())
 
 	go func() {