Skip to content

Commit c418bea

Browse files
Fix: isvc resource config name in inferenceservice configmap (kserve#4215)
Signed-off-by: Sukumar Gaonkar <sgaonkar4@bloomberg.net> Co-authored-by: Dan Sun <dsun20@bloomberg.net>
1 parent a2296cc commit c418bea

File tree

5 files changed

+14
-13
lines changed

5 files changed

+14
-13
lines changed

charts/kserve-resources/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ $ helm install kserve oci://ghcr.io/kserve/charts/kserve --version v0.15.0-rc0
6363
| kserve.controller.tolerations | list | `[]` | A list of Kubernetes Tolerations, if required. For more information, see [Toleration v1 core](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#toleration-v1-core). For example: tolerations: - key: foo.bar.com/role operator: Equal value: master effect: NoSchedule |
6464
| kserve.controller.topologySpreadConstraints | list | `[]` | A list of Kubernetes TopologySpreadConstraints, if required. For more information, see [Topology spread constraint v1 core](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#topologyspreadconstraint-v1-core For example: topologySpreadConstraints: - maxSkew: 2 topologyKey: topology.kubernetes.io/zone whenUnsatisfiable: ScheduleAnyway labelSelector: matchLabels: app.kubernetes.io/instance: kserve-controller-manager app.kubernetes.io/component: controller |
6565
| kserve.controller.webhookServiceAnnotations | object | `{}` | Optional additional annotations to add to the webhook service. |
66-
| kserve.inferenceservice.resources.limits.cpu | string | `"100m"` | |
67-
| kserve.inferenceservice.resources.limits.memory | string | `"256Mi"` | |
68-
| kserve.inferenceservice.resources.requests.cpu | string | `"100m"` | |
69-
| kserve.inferenceservice.resources.requests.memory | string | `"256Mi"` | |
66+
| kserve.inferenceservice.resources.limits.cpu | string | `"1"` | |
67+
| kserve.inferenceservice.resources.limits.memory | string | `"2Gi"` | |
68+
| kserve.inferenceservice.resources.requests.cpu | string | `"1"` | |
69+
| kserve.inferenceservice.resources.requests.memory | string | `"2Gi"` | |
7070
| kserve.localmodel.agent.affinity | object | `{}` | |
7171
| kserve.localmodel.agent.hostPath | string | `"/mnt/models"` | |
7272
| kserve.localmodel.agent.image | string | `"kserve/kserve-localmodelnode-agent"` | |

charts/kserve-resources/templates/configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ data:
609609
"autoMountServiceAccountToken": {{ .Values.kserve.security.autoMountServiceAccountToken }}
610610
}
611611
612-
inferenceservice: |-
612+
inferenceService: |-
613613
{
614614
"resource": {
615615
"cpuLimit": "{{ .Values.kserve.inferenceservice.resources.limits.cpu }}",

charts/kserve-resources/values.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,8 @@ kserve:
445445
inferenceservice:
446446
resources:
447447
limits:
448-
cpu: 100m
449-
memory: 256Mi
448+
cpu: "1"
449+
memory: "2Gi"
450450
requests:
451-
cpu: 100m
452-
memory: 256Mi
451+
cpu: "1"
452+
memory: "2Gi"

config/configmap/inferenceservice.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@ data:
682682
"autoMountServiceAccountToken": true
683683
}
684684
685-
inferenceservice: |-
685+
inferenceService: |-
686686
{
687687
"resource": {
688688
"cpuLimit": "1",

pkg/apis/serving/v1beta1/inference_service_defaults.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ import (
3333
logf "sigs.k8s.io/controller-runtime/pkg/log"
3434
"sigs.k8s.io/controller-runtime/pkg/webhook"
3535

36+
"k8s.io/client-go/kubernetes/scheme"
37+
3638
"github.com/kserve/kserve/pkg/apis/serving/v1alpha1"
3739
"github.com/kserve/kserve/pkg/constants"
3840
"github.com/kserve/kserve/pkg/utils"
39-
"k8s.io/client-go/kubernetes/scheme"
4041
)
4142

4243
var (
@@ -84,8 +85,6 @@ func setResourceRequirementDefaults(config *InferenceServicesConfig, requirement
8485
}
8586
}
8687

87-
logf.Log.Info("Setting default resource requirements -----------------", "requests", requirements.Requests, "limits", requirements.Limits)
88-
8988
if requirements.Limits == nil {
9089
requirements.Limits = v1.ResourceList{}
9190
}
@@ -94,6 +93,8 @@ func setResourceRequirementDefaults(config *InferenceServicesConfig, requirement
9493
requirements.Limits[k] = v
9594
}
9695
}
96+
97+
logf.Log.Info("Setting default resource requirements ", "requests", requirements.Requests, "limits", requirements.Limits)
9798
}
9899

99100
func (d *InferenceServiceDefaulter) Default(ctx context.Context, obj runtime.Object) error {

0 commit comments

Comments
 (0)