Merge pull request #489 from shengnuo/nim-custom-scheduler

Allow custom scheduler to be specified in NIMService and NIMPipeline

Author: shengnuo

api/apps/v1alpha1/nimservice_types.go

@@ -76,6 +76,7 @@ type NIMServiceSpec struct {
 	ReadinessProbe Probe                        `json:"readinessProbe,omitempty"`
 	StartupProbe   Probe                        `json:"startupProbe,omitempty"`
 	Scale          Autoscaling                  `json:"scale,omitempty"`
+	SchedulerName  string                       `json:"schedulerName,omitempty"`
 	Metrics        Metrics                      `json:"metrics,omitempty"`
 	// +kubebuilder:validation:Minimum=1
 	// +kubebuilder:default:=1
@@ -693,6 +694,9 @@ func (n *NIMService) GetDeploymentParams() *rendertypes.DeploymentParams {
 	// Set runtime class
 	params.RuntimeClassName = n.GetRuntimeClassName()
 
+	// Set scheduler
+	params.SchedulerName = n.GetSchedulerName()
+
 	// Setup container ports for nimservice
 	params.Ports = []corev1.ContainerPort{
 		{
@@ -718,6 +722,11 @@ func (n *NIMService) GetDeploymentParams() *rendertypes.DeploymentParams {
 	return params
 }
 
+// GetSchedulerName returns the scheduler name for the NIMService deployment.
+func (n *NIMService) GetSchedulerName() string {
+	return n.Spec.SchedulerName
+}
+
 // GetStatefulSetParams returns params to render StatefulSet from templates.
 func (n *NIMService) GetStatefulSetParams() *rendertypes.StatefulSetParams {
 

bundle/manifests/apps.nvidia.com_nimpipelines.yaml

@@ -2008,6 +2008,8 @@ spec:
                               - maxReplicas
                               type: object
                           type: object
+                        schedulerName:
+                          type: string
                         startupProbe:
                           description: Probe defines attributes for startup/liveness/readiness
                             probes.

bundle/manifests/apps.nvidia.com_nimservices.yaml

@@ -1927,6 +1927,8 @@ spec:
                     - maxReplicas
                     type: object
                 type: object
+              schedulerName:
+                type: string
               startupProbe:
                 description: Probe defines attributes for startup/liveness/readiness
                   probes.

config/crd/bases/apps.nvidia.com_nimpipelines.yaml

@@ -2008,6 +2008,8 @@ spec:
                               - maxReplicas
                               type: object
                           type: object
+                        schedulerName:
+                          type: string
                         startupProbe:
                           description: Probe defines attributes for startup/liveness/readiness
                             probes.

config/crd/bases/apps.nvidia.com_nimservices.yaml

@@ -1927,6 +1927,8 @@ spec:
                     - maxReplicas
                     type: object
                 type: object
+              schedulerName:
+                type: string
               startupProbe:
                 description: Probe defines attributes for startup/liveness/readiness
                   probes.

deployments/helm/k8s-nim-operator/crds/apps.nvidia.com_nimpipelines.yaml

@@ -2008,6 +2008,8 @@ spec:
                               - maxReplicas
                               type: object
                           type: object
+                        schedulerName:
+                          type: string
                         startupProbe:
                           description: Probe defines attributes for startup/liveness/readiness
                             probes.

deployments/helm/k8s-nim-operator/crds/apps.nvidia.com_nimservices.yaml

@@ -1927,6 +1927,8 @@ spec:
                     - maxReplicas
                     type: object
                 type: object
+              schedulerName:
+                type: string
               startupProbe:
                 description: Probe defines attributes for startup/liveness/readiness
                   probes.

internal/render/types/types.go

@@ -66,6 +66,7 @@ type DeploymentParams struct {
 	Image              string
 	ImagePullSecrets   []string
 	ImagePullPolicy    string
+	SchedulerName      string
 	Volumes            []corev1.Volume
 	VolumeMounts       []corev1.VolumeMount
 	Env                []corev1.EnvVar

manifests/deployment.yaml

@@ -35,6 +35,9 @@ spec:
         {{- .PodAnnotations | yaml | nindent 8 }}
       {{- end }}
     spec:
+      {{- if .SchedulerName }}
+      schedulerName: {{ .SchedulerName }}
+      {{- end }}
       serviceAccountName: {{ .ServiceAccountName }}
       runtimeClassName: {{ .RuntimeClassName }}
       initContainers: