Remove kserve from mlstacks (#122)

* Remove kserve from aws-modular * Remove kserve * Formatting with terraform fmt * Remove extra conditional end bracket * test spellcheck working * revert typos
zenml-io · Dec 22, 2023 · 1497314 · 1497314
1 parent d5ad285
commit 1497314
Show file tree

Hide file tree

Showing 41 changed files with 75 additions and 691 deletions.
diff --git a/docs/book/stacks/aws.md b/docs/book/stacks/aws.md
@@ -16,7 +16,7 @@ as can a list of components that are coming soon.
 | Experiment Tracker | mlflow                                            |
 | Orchestrator       | kubeflow, kubernetes, sagemaker, skypilot, tekton |
 | MLOps Platform     | zenml                                             |
-| Model Deployer     | seldon, kserve                                    |
+| Model Deployer     | seldon                                    |
 | Step Operator      | sagemaker                                         |
 
 ## Coming Soon!

diff --git a/docs/book/stacks/gcp.md b/docs/book/stacks/gcp.md
@@ -22,7 +22,7 @@ and cannot be created without one.
 | Experiment Tracker | mlflow                                         |
 | Orchestrator       | kubeflow, kubernetes, skypilot, tekton, vertex |
 | MLOps Platform     | zenml                                          |
-| Model Deployer     | seldon, kserve                                 |
+| Model Deployer     | seldon                                 |
 | Step Operator      | vertex                                         |
 
 ## Coming Soon!

diff --git a/docs/book/stacks/k3d.md b/docs/book/stacks/k3d.md
@@ -16,7 +16,7 @@ as can a list of components that are coming soon.
 | Experiment Tracker | mlflow                                  |
 | Orchestrator       | kubeflow, kubernetes, sagemaker, tekton |
 | MLOps Platform     | zenml                                   |
-| Model Deployer     | seldon, kserve                          |
+| Model Deployer     | seldon                          |
 
 ## Coming Soon!
 

diff --git a/src/mlstacks/constants.py b/src/mlstacks/constants.py
@@ -36,7 +36,7 @@
         "vertex",
     ],
     "mlops_platform": ["zenml"],
-    "model_deployer": ["seldon", "kserve"],
+    "model_deployer": ["seldon"],
     "step_operator": ["sagemaker", "vertex"],
 }
 

diff --git a/src/mlstacks/enums.py b/src/mlstacks/enums.py
@@ -38,7 +38,6 @@ class ComponentFlavorEnum(str, Enum):
 
     AWS = "aws"
     GCP = "gcp"
-    KSERVE = "kserve"
     KUBEFLOW = "kubeflow"
     KUBERNETES = "kubernetes"
     MINIO = "minio"

diff --git a/src/mlstacks/terraform/aws-modular/eks.tf b/src/mlstacks/terraform/aws-modular/eks.tf
@@ -1,8 +1,7 @@
 # eks module to create a cluster
 # newer versions of it had some error so going with v17.23.0 for now
 locals {
-  enable_eks = (var.enable_orchestrator_kubeflow || var.enable_orchestrator_tekton || var.enable_orchestrator_kubernetes ||
-    var.enable_model_deployer_kserve || var.enable_model_deployer_seldon || var.enable_experiment_tracker_mlflow ||
+  enable_eks = (var.enable_orchestrator_kubeflow || var.enable_orchestrator_tekton || var.enable_orchestrator_kubernetes || var.enable_model_deployer_seldon || var.enable_experiment_tracker_mlflow ||
   var.enable_zenml)
 }
 

diff --git a/src/mlstacks/terraform/aws-modular/istio.tf b/src/mlstacks/terraform/aws-modular/istio.tf
@@ -1,8 +1,7 @@
-# create kserve module
 module "istio" {
   source = "../modules/istio-module"
 
-  count = (var.enable_model_deployer_kserve || var.enable_model_deployer_seldon) ? 1 : 0
+  count = (var.enable_model_deployer_seldon) ? 1 : 0
 
   depends_on = [
     aws_eks_cluster.cluster,

diff --git a/src/mlstacks/terraform/aws-modular/kserve.tf b/src/mlstacks/terraform/aws-modular/kserve.tf
diff --git a/src/mlstacks/terraform/aws-modular/locals.tf b/src/mlstacks/terraform/aws-modular/locals.tf
@@ -58,14 +58,6 @@ locals {
     ingress_host_prefix = "mlflow"
   }
 
-  kserve = {
-    version              = "0.9.0"
-    knative_version      = "1.0.0"
-    workloads_namespace  = "zenml-workloads-kserve"
-    service_account_name = "kserve"
-    ingress_host         = "kserve.example.com"
-  }
-
   seldon = {
     version              = "1.15.0"
     name                 = "seldon"

diff --git a/src/mlstacks/terraform/aws-modular/output_file.tf b/src/mlstacks/terraform/aws-modular/output_file.tf
@@ -70,13 +70,6 @@ resource "local_file" "stack_file" {
         configuration: {"tracking_uri": "${var.enable_experiment_tracker_mlflow ? module.mlflow[0].mlflow-tracking-URL : ""}", "tracking_username": "${var.mlflow-username}", "tracking_password": "${var.mlflow-password}"}
 %{endif}
 
-%{if var.enable_model_deployer_kserve}
-      model_deployer:
-        id: ${uuid()}
-        flavor: kserve
-        name: eks_kserve_model_deployer
-        configuration: {"kubernetes_context": "${aws_eks_cluster.cluster[0].arn}", "kubernetes_namespace": "${local.kserve.workloads_namespace}", "base_url": "${module.kserve[0].kserve-base-URL}", "secret": "aws_kserve_secret"}
-%{endif}
 %{if var.enable_model_deployer_seldon}
       model_deployer:
         id: ${uuid()}

diff --git a/src/mlstacks/terraform/aws-modular/outputs.tf b/src/mlstacks/terraform/aws-modular/outputs.tf
@@ -84,25 +84,19 @@ output "experiment_tracker_configuration" {
   }) : ""
 }
 
-# if kserve is enabled, set the model deployer outputs to the kserve values
 # if seldon is enabled, set the model deployer outputs to the seldon values
 # otherwise, set the model deployer outputs to empty strings
 output "model_deployer_id" {
-  value = var.enable_model_deployer_kserve ? uuid() : var.enable_model_deployer_seldon ? uuid() : ""
+  value = var.enable_model_deployer_seldon ? uuid() : ""
 }
 output "model_deployer_flavor" {
-  value = var.enable_model_deployer_kserve ? "kserve" : var.enable_model_deployer_seldon ? "seldon" : ""
+  value = var.enable_model_deployer_seldon ? "seldon" : ""
 }
 output "model_deployer_name" {
-  value = var.enable_model_deployer_kserve ? "eks_kserve_model_deployer_${random_string.unique.result}" : var.enable_model_deployer_seldon ? "eks_seldon_model_deployer_${random_string.unique.result}" : ""
+  value = var.enable_model_deployer_seldon ? "eks_seldon_model_deployer_${random_string.unique.result}" : ""
 }
 output "model_deployer_configuration" {
-  value = var.enable_model_deployer_kserve ? jsonencode({
-    kubernetes_context   = "${aws_eks_cluster.cluster[0].arn}"
-    kubernetes_namespace = local.kserve.workloads_namespace
-    base_url             = module.kserve[0].kserve-base-URL
-    secret               = "aws_kserve_secret"
-    }) : var.enable_model_deployer_seldon ? jsonencode({
+  value = var.enable_model_deployer_seldon ? jsonencode({
     kubernetes_context   = "${aws_eks_cluster.cluster[0].arn}"
     kubernetes_namespace = local.seldon.workloads_namespace
     base_url             = "http://${module.istio[0].ingress-hostname}:${module.istio[0].ingress-port}"
@@ -158,15 +152,6 @@ output "mlflow-bucket" {
   value = (var.enable_experiment_tracker_mlflow && var.mlflow_bucket == "") ? "mlflow-s3-${random_string.mlflow_bucket_suffix.result}" : ""
 }
 
-# output for kserve model deployer
-output "kserve-workload-namespace" {
-  value       = var.enable_model_deployer_kserve ? local.kserve.workloads_namespace : null
-  description = "The namespace created for hosting your Kserve workloads"
-}
-output "kserve-base-url" {
-  value = var.enable_model_deployer_kserve ? module.kserve[0].kserve-base-URL : null
-}
-
 # output for seldon model deployer
 output "seldon-workload-namespace" {
   value       = var.enable_model_deployer_seldon ? local.seldon.workloads_namespace : null

diff --git a/src/mlstacks/terraform/aws-modular/variables.tf b/src/mlstacks/terraform/aws-modular/variables.tf
@@ -31,10 +31,6 @@ variable "enable_experiment_tracker_mlflow" {
   description = "Enable MLflow deployment"
   default     = false
 }
-variable "enable_model_deployer_kserve" {
-  description = "Enable KServe deployment"
-  default     = false
-}
 variable "enable_model_deployer_seldon" {
   description = "Enable Seldon deployment"
   default     = false

diff --git a/src/mlstacks/terraform/gcp-modular/gke.tf b/src/mlstacks/terraform/gcp-modular/gke.tf
@@ -1,7 +1,8 @@
 data "google_client_config" "default" {}
 # module "gke" {
-#   count = (var.enable_orchestrator_kubeflow || var.enable_orchestrator_tekton || var.enable_orchestrator_kubernetes || 
-#             var.enable_model_deployer_kserve || var.enable_model_deployer_seldon || var.enable_experiment_tracker_mlflow ||
+#   count = (var.enable_orchestrator_kubeflow || var.enable_orchestrator_tekton
+#   || var.enable_orchestrator_kubernetes ||  
+#   var.enable_model_deployer_seldon || var.enable_experiment_tracker_mlflow ||
 #             var.enable_zenml)? 1: 0
 
 #   depends_on = [
@@ -63,7 +64,7 @@ data "google_client_config" "default" {}
 # }
 locals {
   enable_gke = (var.enable_orchestrator_kubeflow || var.enable_orchestrator_tekton || var.enable_orchestrator_kubernetes ||
-    var.enable_model_deployer_kserve || var.enable_model_deployer_seldon || var.enable_experiment_tracker_mlflow ||
+    var.enable_model_deployer_seldon || var.enable_experiment_tracker_mlflow ||
   var.enable_zenml)
 }
 
@@ -78,7 +79,7 @@ data "external" "get_cluster" {
 
 resource "google_container_cluster" "gke" {
   count = (var.enable_orchestrator_kubeflow || var.enable_orchestrator_tekton || var.enable_orchestrator_kubernetes ||
-    var.enable_model_deployer_kserve || var.enable_model_deployer_seldon || var.enable_experiment_tracker_mlflow ||
+    var.enable_model_deployer_seldon || var.enable_experiment_tracker_mlflow ||
   var.enable_zenml) ? 1 : 0
 
   name    = "${local.prefix}-${local.gke.cluster_name}"
@@ -116,7 +117,7 @@ resource "google_container_cluster" "gke" {
 # service account for GKE nodes
 resource "google_service_account" "gke-service-account" {
   count = (var.enable_orchestrator_kubeflow || var.enable_orchestrator_tekton || var.enable_orchestrator_kubernetes ||
-    var.enable_model_deployer_kserve || var.enable_model_deployer_seldon || var.enable_experiment_tracker_mlflow ||
+    var.enable_model_deployer_seldon || var.enable_experiment_tracker_mlflow ||
   var.enable_zenml) ? 1 : 0
   account_id   = "${local.prefix}-${local.gke.service_account_name}"
   project      = var.project_id
@@ -135,7 +136,7 @@ resource "google_project_iam_binding" "container-registry" {
 
 resource "google_project_iam_binding" "secret-manager" {
   count = (var.enable_orchestrator_kubeflow || var.enable_orchestrator_tekton || var.enable_orchestrator_kubernetes ||
-    var.enable_model_deployer_kserve || var.enable_model_deployer_seldon || var.enable_experiment_tracker_mlflow ||
+    var.enable_model_deployer_seldon || var.enable_experiment_tracker_mlflow ||
   var.enable_zenml) ? 1 : 0
   project = var.project_id
   role    = "roles/secretmanager.admin"
@@ -147,7 +148,7 @@ resource "google_project_iam_binding" "secret-manager" {
 
 resource "google_project_iam_binding" "cloudsql" {
   count = (var.enable_orchestrator_kubeflow || var.enable_orchestrator_tekton || var.enable_orchestrator_kubernetes ||
-    var.enable_model_deployer_kserve || var.enable_model_deployer_seldon || var.enable_experiment_tracker_mlflow ||
+    var.enable_model_deployer_seldon || var.enable_experiment_tracker_mlflow ||
   var.enable_zenml) ? 1 : 0
   project = var.project_id
   role    = "roles/cloudsql.admin"
@@ -159,7 +160,7 @@ resource "google_project_iam_binding" "cloudsql" {
 
 resource "google_project_iam_binding" "storageadmin" {
   count = (var.enable_orchestrator_kubeflow || var.enable_orchestrator_tekton || var.enable_orchestrator_kubernetes ||
-    var.enable_model_deployer_kserve || var.enable_model_deployer_seldon || var.enable_experiment_tracker_mlflow ||
+    var.enable_model_deployer_seldon || var.enable_experiment_tracker_mlflow ||
   var.enable_zenml) ? 1 : 0
   project = var.project_id
   role    = "roles/storage.admin"
@@ -171,7 +172,7 @@ resource "google_project_iam_binding" "storageadmin" {
 
 resource "google_project_iam_binding" "vertex-ai-user" {
   count = (var.enable_orchestrator_kubeflow || var.enable_orchestrator_tekton || var.enable_orchestrator_kubernetes ||
-    var.enable_model_deployer_kserve || var.enable_model_deployer_seldon || var.enable_experiment_tracker_mlflow ||
+    var.enable_model_deployer_seldon || var.enable_experiment_tracker_mlflow ||
   var.enable_zenml) ? 1 : 0
   project = var.project_id
   role    = "roles/aiplatform.user"

diff --git a/src/mlstacks/terraform/gcp-modular/istio.tf b/src/mlstacks/terraform/gcp-modular/istio.tf
@@ -1,8 +1,7 @@
-# create kserve module
 module "istio" {
   source = "../modules/istio-module"
 
-  count = (var.enable_model_deployer_kserve || var.enable_model_deployer_seldon) ? 1 : 0
+  count = (var.enable_model_deployer_seldon) ? 1 : 0
 
   depends_on = [
     google_container_cluster.gke,