kserve · sivanantha321 · Apr 28, 2025 · May 7, 2025 · May 7, 2025 · May 7, 2025
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -1118,10 +1118,6 @@ jobs:
         run: |
           kubectl create ns kserve-localmodel-jobs
 
-      - name: Label worker nodes for modelcache
-        run: |
-          kubectl label nodes -l '!node-role.kubernetes.io/control-plane' kserve/localmodel=worker
-
       - name: Enable nodeselector in knative
         run: |
           kubectl patch configmaps -n knative-serving config-features --patch '{"data": {"kubernetes.podspec-nodeselector": "enabled"}}'

diff --git a/Makefile b/Makefile
@@ -73,7 +73,7 @@ py-lint: $(FLAKE8_LINT)
 manifests: controller-gen yq
 	@$(CONTROLLER_GEN) $(CRD_OPTIONS) paths=./pkg/apis/serving/... output:crd:dir=config/crd/full
 	@$(CONTROLLER_GEN) rbac:roleName=kserve-manager-role paths={./pkg/controller/v1alpha1/inferencegraph,./pkg/controller/v1alpha1/trainedmodel,./pkg/controller/v1beta1/...} output:rbac:artifacts:config=config/rbac
-	@$(CONTROLLER_GEN) rbac:roleName=kserve-localmodel-manager-role paths=./pkg/controller/v1alpha1/localmodel output:rbac:artifacts:config=config/rbac/localmodel
+	@$(CONTROLLER_GEN) rbac:roleName=kserve-localmodel-manager-role paths={./pkg/controller/v1alpha1/localmodel,./pkg/controller/v1alpha1/localmodelnodegroup} output:rbac:artifacts:config=config/rbac/localmodel
 	@$(CONTROLLER_GEN) rbac:roleName=kserve-localmodelnode-agent-role paths=./pkg/controller/v1alpha1/localmodelnode output:rbac:artifacts:config=config/rbac/localmodelnode
 	# Copy the cluster role to the helm chart
 	cp config/rbac/auth_proxy_role.yaml charts/kserve-resources/templates/clusterrole.yaml
@@ -246,7 +246,7 @@ undeploy:
 undeploy-dev:
 	kubectl delete -k config/overlays/development
 
-bump-version:
+bump-version: yq
 	@echo "bumping version numbers for this release"
 	@hack/prepare-for-release.sh $(PRIOR_VERSION) $(NEW_VERSION)
 

diff --git a/charts/kserve-resources/README.md b/charts/kserve-resources/README.md
@@ -67,15 +67,14 @@ $ helm install kserve oci://ghcr.io/kserve/charts/kserve --version v0.15.2
 | kserve.inferenceservice.resources.limits.memory | string | `"2Gi"` |  |
 | kserve.inferenceservice.resources.requests.cpu | string | `"1"` |  |
 | kserve.inferenceservice.resources.requests.memory | string | `"2Gi"` |  |
-| kserve.localmodel.agent.affinity | object | `{}` |  |
-| kserve.localmodel.agent.hostPath | string | `"/mnt/models"` |  |
 | kserve.localmodel.agent.image | string | `"kserve/kserve-localmodelnode-agent"` |  |
-| kserve.localmodel.agent.nodeSelector | object | `{}` |  |
+| kserve.localmodel.agent.imagePullPolicy | string | `"Always"` |  |
 | kserve.localmodel.agent.reconcilationFrequencyInSecs | int | `60` |  |
-| kserve.localmodel.agent.securityContext.runAsNonRoot | bool | `true` |  |
-| kserve.localmodel.agent.securityContext.runAsUser | int | `1000` |  |
+| kserve.localmodel.agent.resources.limits.cpu | string | `"100m"` |  |
+| kserve.localmodel.agent.resources.limits.memory | string | `"300Mi"` |  |
+| kserve.localmodel.agent.resources.requests.cpu | string | `"100m"` |  |
+| kserve.localmodel.agent.resources.requests.memory | string | `"200Mi"` |  |
 | kserve.localmodel.agent.tag | string | `"v0.15.2"` |  |
-| kserve.localmodel.agent.tolerations | list | `[]` |  |
 | kserve.localmodel.controller.image | string | `"kserve/kserve-localmodel-controller"` |  |
 | kserve.localmodel.controller.tag | string | `"v0.15.2"` |  |
 | kserve.localmodel.disableVolumeManagement | bool | `false` |  |

diff --git a/charts/kserve-resources/templates/configmap.yaml b/charts/kserve-resources/templates/configmap.yaml
@@ -554,7 +554,19 @@ data:
          # This is to detect if models are missing from local disk
          "reconcilationFrequencyInSecs": {{ .Values.kserve.localmodel.agent.reconcilationFrequencyInSecs }}
          # This is to disable localmodel pv and pvc management for namespaces without isvcs
-         "disableVolumeManagement": false
+         "disableVolumeManagement": false,
+         # localModelAgentImage specifies the default image used for the local model node agent.
+         "localModelAgentImage": "kserve/kserve-localmodelnode-agent:latest",
+         # localModelAgentImagePullPolicy specifies the image pull policy for the local model node agent.
+         "localModelAgentImagePullPolicy": "Always",
+         # localModelAgentCpuRequest specifies the cpu request for the local model node agent.
+         "localModelAgentCpuRequest": "100m",
+         # localModelAgentMemoryRequest specifies the memory request for the local model node agent.
+         "localModelAgentMemoryRequest": "200Mi",
+         # localModelAgentCpuLimit specifies the cpu limit for the local model node agent.
+         "localModelAgentCpuLimit": "100m",
+         # localModelAgentMemoryLimit specifies the memory limit for the local model node agent.
+         "localModelAgentMemoryLimit": "300Mi"
        }
 
   agent: |-
@@ -675,7 +687,13 @@ data:
       "defaultJobImage": "kserve/storage-initializer:latest",
       "fsGroup": {{ .Values.kserve.localmodel.securityContext.fsGroup }},
       "reconcilationFrequencyInSecs": {{ .Values.kserve.localmodel.agent.reconcilationFrequencyInSecs }},
-      "disableVolumeManagement": {{ .Values.kserve.localmodel.disableVolumeManagement }}
+      "disableVolumeManagement": {{ .Values.kserve.localmodel.disableVolumeManagement }},
+      "localModelAgentImage": "{{ .Values.kserve.localmodel.agent.image }}:{{ .Values.kserve.localmodel.agent.tag }}",
+      "localModelAgentImagePullPolicy": "{{ .Values.kserve.localmodel.agent.imagePullPolicy }}",
+      "localModelAgentCpuRequest": "{{ .Values.kserve.localmodel.agent.resources.requests.cpu }}",
+      "localModelAgentMemoryRequest": "{{ .Values.kserve.localmodel.agent.resources.requests.memory }}",
+      "localModelAgentCpuLimit": "{{ .Values.kserve.localmodel.agent.resources.limits.cpu }}",
+      "localModelAgentMemoryLimit": "{{ .Values.kserve.localmodel.agent.resources.limits.memory }}"
     }
   security: |-
     {

diff --git a/charts/kserve-resources/templates/localmodel/role.yaml b/charts/kserve-resources/templates/localmodel/role.yaml
@@ -38,11 +38,21 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - apps
+  resources:
+  - daemonsets
+  verbs:
+  - create
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - serving.kserve.io
   resources:
   - inferenceservices
-  - localmodelnodegroups
   verbs:
   - get
   - list
@@ -68,6 +78,27 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - serving.kserve.io
+  resources:
+  - localmodelnodegroups
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - serving.kserve.io
+  resources:
+  - localmodelnodegroups/finalizers
+  verbs:
+  - create
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - serving.kserve.io
   resources:

diff --git a/charts/kserve-resources/templates/localmodelnode/daemonset.yaml b/charts/kserve-resources/templates/localmodelnode/daemonset.yaml
diff --git a/charts/kserve-resources/values.yaml b/charts/kserve-resources/values.yaml
@@ -420,26 +420,27 @@ kserve:
       defaultVersion: *defaultVersion
       imagePullSecrets: []
   localmodel:
-    enabled: false
-    controller:
-      image: kserve/kserve-localmodel-controller
-      tag: *defaultVersion
-    jobNamespace: kserve-localmodel-jobs
-    jobTTLSecondsAfterFinished: 3600
-    securityContext:
-      fsGroup: 1000
-    disableVolumeManagement: false
-    agent:
-      nodeSelector: {}
-      affinity: {}
-      tolerations: []
-      hostPath: /mnt/models
-      image: kserve/kserve-localmodelnode-agent
-      tag: *defaultVersion
-      reconcilationFrequencyInSecs: 60
+      enabled: false
+      controller:
+        image: kserve/kserve-localmodel-controller
+        tag: *defaultVersion
+      jobNamespace: kserve-localmodel-jobs
+      jobTTLSecondsAfterFinished: 3600
       securityContext:
-        runAsUser: 1000
-        runAsNonRoot: true
+        fsGroup: 1000
+      disableVolumeManagement: false
+      agent:
+        image: kserve/kserve-localmodelnode-agent
+        tag: *defaultVersion
+        imagePullPolicy: Always
+        reconcilationFrequencyInSecs: 60
+        resources:
+          requests:
+            cpu: 100m
+            memory: 200Mi
+          limits:
+            cpu: 100m
+            memory: 300Mi
   security:
     autoMountServiceAccountToken: true
   inferenceservice:

diff --git a/cmd/localmodel/main.go b/cmd/localmodel/main.go
@@ -36,6 +36,7 @@ import (
 	"github.com/kserve/kserve/pkg/apis/serving/v1alpha1"
 	"github.com/kserve/kserve/pkg/apis/serving/v1beta1"
 	localmodelcontroller "github.com/kserve/kserve/pkg/controller/v1alpha1/localmodel"
+	"github.com/kserve/kserve/pkg/controller/v1alpha1/localmodelnodegroup"
 )
 
 var setupLog = ctrl.Log.WithName("setup")
@@ -146,6 +147,18 @@ func main() {
 		os.Exit(1)
 	}
 
+	// Setup LocalModelNodeGroup controller
+	setupLog.Info("Setting up v1alpha1 LocalModelNodeGroup controller")
+	if err = (&localmodelnodegroup.LocalModelNodeGroupReconciler{
+		Client:    mgr.GetClient(),
+		Clientset: clientSet,
+		Log:       ctrl.Log.WithName("v1alpha1Controllers").WithName("LocalModelNodeGroup"),
+		Scheme:    mgr.GetScheme(),
+	}).SetupWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to create controller", "v1alpha1Controllers", "LocalModelNodeGroup")
+		os.Exit(1)
+	}
+
 	// Start the Cmd
 	setupLog.Info("Starting the Cmd.")
 	if err := mgr.Start(signals.SetupSignalHandler()); err != nil {

diff --git a/config/configmap/inferenceservice.yaml b/config/configmap/inferenceservice.yaml
@@ -595,7 +595,19 @@ data:
          # This is to detect if models are missing from local disk
          "reconcilationFrequencyInSecs": 60,
          # This is to disable localmodel pv and pvc management for namespaces without isvcs
-         "disableVolumeManagement": false
+         "disableVolumeManagement": false,
+         # localModelAgentImage specifies the default image used for the local model node agent.
+         "localModelAgentImage": "kserve/kserve-localmodelnode-agent:latest",
+         # localModelAgentImagePullPolicy specifies the image pull policy for the local model node agent.
+         "localModelAgentImagePullPolicy": "Always",
+         # localModelAgentCpuRequest specifies the cpu request for the local model node agent.
+         "localModelAgentCpuRequest": "100m",
+         # localModelAgentMemoryRequest specifies the memory request for the local model node agent.
+         "localModelAgentMemoryRequest": "200Mi",
+         # localModelAgentCpuLimit specifies the cpu limit for the local model node agent.
+         "localModelAgentCpuLimit": "100m",
+         # localModelAgentMemoryLimit specifies the memory limit for the local model node agent.
+         "localModelAgentMemoryLimit": "300Mi"
        }
 
   explainers: |-
@@ -714,7 +726,13 @@ data:
       "enabled": false,
       "jobNamespace": "kserve-localmodel-jobs",
       "defaultJobImage" : "kserve/storage-initializer:latest",
-      "fsGroup": 1000
+      "fsGroup": 1000,
+      "localModelAgentImage": "kserve/kserve-localmodelnode-agent:latest",
+      "localModelAgentImagePullPolicy": "Always",
+      "localModelAgentCpuRequest": "100m",
+      "localModelAgentMemoryRequest": "200Mi",
+      "localModelAgentCpuLimit": "100m",
+      "localModelAgentMemoryLimit": "300Mi"
     }
 
   security: |-

diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -15,7 +15,6 @@ resources:
 - ../webhook
 - ../certmanager
 - ../localmodels
-- ../localmodelnodes
 
 generatorOptions:
   disableNameSuffixHash: true
@@ -213,4 +212,3 @@ patches:
 - path: manager_resources_patch.yaml
 - path: cainjection_conversion_webhook.yaml
 - path: localmodel_manager_image_patch.yaml
-- path: localmodelnode_agent_image_patch.yaml
diff --git a/config/default/localmodelnode_agent_image_patch.yaml b/config/default/localmodelnode_agent_image_patch.yaml
diff --git a/config/localmodelnodes/kustomization.yaml b/config/localmodelnodes/kustomization.yaml