Set KServe inference service version by default. (#981)

* Support KServe inference service Signed-off-by: Syulin7 <[email protected]> * Set KServe inference service version by default. Signed-off-by: Syulin7 <[email protected]> --------- Signed-off-by: Syulin7 <[email protected]>
kubeflow · Aug 28, 2023 · de8cb95 · de8cb95
1 parent 3fe9ae4
commit de8cb95
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 34 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.9.10
+0.9.11
diff --git a/charts/kserve/templates/inferenceservice.yaml b/charts/kserve/templates/inferenceservice.yaml
@@ -1,7 +1,6 @@
 {{- $gpuCount := .Values.gpuCount -}}
 {{- $gpuMemory := .Values.gpuMemory -}}
 {{- $gpuCore := .Values.gpuCore -}}
-{{- $dataDirs := .Values.dataDirs -}}
 apiVersion: serving.kserve.io/v1beta1
 kind: InferenceService
 metadata:
@@ -16,7 +15,6 @@ metadata:
  app: {{ template "kserve.name" . }}
  servingType: "kserve"
  servingName: "{{ .Values.servingName }}"
- servingVersion: "{{ .Values.servingVersion }}"
  {{- range $key, $value := .Values.labels }}
  {{ $key }}: {{ $value | quote }}
  {{- end }}
@@ -115,18 +113,12 @@ spec:
  {{- range $pvcName, $destPath := .Values.modelDirs}}
  - name: "{{ $pvcName }}"
  mountPath: "{{ $destPath }}"
- {{- if hasKey $.Values.dataSubPathExprs $pvcName }}
- subPathExpr: {{ get $.Values.dataSubPathExprs $pvcName }}
- {{- end }}
  {{- end }}
  {{- end }}
  {{- if .Values.tempDirs }}
  {{- range $name, $destPath := .Values.tempDirs}}
  - name: "{{ $name }}"
  mountPath: "{{ $destPath }}"
- {{- if hasKey $.Values.tempDirSubPathExprs $name }}
- subPathExpr: {{ get $.Values.tempDirSubPathExprs $name }}
- {{- end }}
  {{- end }}
  {{- end }}
  {{- if ne (len .Values.configFiles) 0 }}
@@ -142,12 +134,6 @@ spec:
  {{- end }}
  {{- end }}
  {{- end }}
- {{- if $dataDirs }}
- {{- range $dataDirs }}
- - name: {{ .name }}
- mountPath: {{ .containerPath }}
- {{- end }}
- {{- end }}
  {{- else }}
  containers:
  - name: kserve-container
@@ -201,18 +187,12 @@ spec:
  {{- range $pvcName, $destPath := .Values.modelDirs}}
  - name: "{{ $pvcName }}"
  mountPath: "{{ $destPath }}"
- {{- if hasKey $.Values.dataSubPathExprs $pvcName }}
- subPathExpr: {{ get $.Values.dataSubPathExprs $pvcName }}
- {{- end }}
  {{- end }}
  {{- end }}
  {{- if .Values.tempDirs }}
  {{- range $name, $destPath := .Values.tempDirs}}
  - name: "{{ $name }}"
  mountPath: "{{ $destPath }}"
- {{- if hasKey $.Values.tempDirSubPathExprs $name }}
- subPathExpr: {{ get $.Values.tempDirSubPathExprs $name }}
- {{- end }}
  {{- end }}
  {{- end }}
  {{- if ne (len .Values.configFiles) 0 }}

diff --git a/docs/releases/v0.9.11.md b/docs/releases/v0.9.11.md
@@ -0,0 +1,6 @@
+# Release 0.9.10
+
+### Changed
+
+- Update dependent component version.
+- Support KServe inference service.
diff --git a/pkg/argsbuilder/serving.go b/pkg/argsbuilder/serving.go
@@ -497,7 +497,7 @@ func (s *ServingArgsBuilder) setEnvs() error {
 }
 
 func (s *ServingArgsBuilder) setServingVersion() error {
- if s.args.Version == "" {
+ if s.args.Version == "" && s.args.Type != types.KServeJob {
  t := time.Now()
  s.args.Version = fmt.Sprint(t.Format("200601021504"))
  }

diff --git a/pkg/serving/get.go b/pkg/serving/get.go
@@ -144,13 +144,32 @@ func PrintServingJob(job ServingJob, format types.FormatStyle) {
  title := ""
  step := ""
  gpuLine := ""
+ var lines []string
  if totalGPUs != 0 {
  title = "\tGPU"
  step = "\t---"
  gpuLine = fmt.Sprintf("GPU: %v", totalGPUs)
+ lines = append(lines, gpuLine)
  }
 
- lines := []string{gpuLine, "", "Instances:", fmt.Sprintf(" NAME\tSTATUS\tAGE\tREADY\tRESTARTS%v\tNODE", title)}
+ if job.Type() == types.KServeJob {
+ if ksjob, ok := job.(*kserveJob); ok {
+ lines = append(lines, "")
+ for _, traffic := range ksjob.inferenceService.Status.Components["predictor"].Traffic {
+ revision := traffic.RevisionName
+ percent := *traffic.Percent
+ if traffic.Tag == "prev" {
+ lines = append(lines, fmt.Sprintf("PrevRevision: %v", revision))
+ lines = append(lines, fmt.Sprintf("PrevPrecent: %v", percent))
+ } else {
+ lines = append(lines, fmt.Sprintf("LatestRevision: %v", revision))
+ lines = append(lines, fmt.Sprintf("LatestPrecent: %v", percent))
+ }
+ }
+ }
+ }
+
+ lines = append(lines, "", "Instances:", fmt.Sprintf(" NAME\tSTATUS\tAGE\tREADY\tRESTARTS%v\tNODE", title))
  lines = append(lines, fmt.Sprintf(" ----\t------\t---\t-----\t--------%v\t----", step))
  for _, i := range jobInfo.Instances {
  value := fmt.Sprintf("%v", i.RequestGPUs)

diff --git a/pkg/serving/serving_kserve.go b/pkg/serving/serving_kserve.go
@@ -48,7 +48,6 @@ func NewKServeProcesser() Processer {
 }
 
 func SubmitKServeJob(namespace string, args *types.KServeArgs) (err error) {
- nameWithVersion := fmt.Sprintf("%v-%v", args.Name, args.Version)
  args.Namespace = namespace
  processers := GetAllProcesser()
  processer, ok := processers[args.Type]
@@ -64,7 +63,7 @@ func SubmitKServeJob(namespace string, args *types.KServeArgs) (err error) {
  }
  // the master is also considered as a worker
  chart := util.GetChartsFolder() + "/kserve"
- err = workflow.SubmitJob(nameWithVersion, string(types.KServeJob), namespace, args, chart, args.HelmOptions...)
+ err = workflow.SubmitJob(args.Name, string(types.KServeJob), namespace, args, chart, args.HelmOptions...)
  if err != nil {
  return err
  }
@@ -88,9 +87,6 @@ func (p *KServeProcesser) GetServingJobs(namespace, name, version string) ([]Ser
  fmt.Sprintf("%v=%v", servingNameLabelKey, name),
  fmt.Sprintf("%v=%v", servingTypeLabelKey, p.processerType),
  }
- if version != "" {
- selector = append(selector, fmt.Sprintf("%v=%v", servingVersionLabelKey, version))
- }
  log.Debugf("processer %v,filter jobs by labels: %v", p.processerType, selector)
  return p.FilterServingJobs(namespace, false, strings.Join(selector, ","))
 }
@@ -131,28 +127,31 @@ func (p *KServeProcesser) FilterServingJobs(namespace string, allNamespace bool,
  filterPods := []*v1.Pod{}
  for _, deployment := range deployments {
  if iservice.Labels[servingNameLabelKey] == deployment.Labels[servingNameLabelKey] &&
- iservice.Labels[servingTypeLabelKey] == deployment.Labels[servingTypeLabelKey] &&
- iservice.Labels[servingVersionLabelKey] == deployment.Labels[servingVersionLabelKey] {
+ iservice.Labels[servingTypeLabelKey] == deployment.Labels[servingTypeLabelKey] {
  filterDeployments = append(filterDeployments, deployment)
  }
  }
 
  for _, pod := range pods {
  if iservice.Labels[servingNameLabelKey] == pod.Labels[servingNameLabelKey] &&
- iservice.Labels[servingTypeLabelKey] == pod.Labels[servingTypeLabelKey] &&
- iservice.Labels[servingVersionLabelKey] == pod.Labels[servingVersionLabelKey] {
+ iservice.Labels[servingTypeLabelKey] == pod.Labels[servingTypeLabelKey] {
  filterPods = append(filterPods, pod)
  }
  }
 
+ version := iservice.Status.Components["predictor"].LatestCreatedRevision
+ if len(version) > 5 {
+ version = version[len(version)-5:]
+ }
+
  servingJobs = append(servingJobs, &kserveJob{
  inferenceService: iservice,
  inferenceDeployments: filterDeployments,
  servingJob: &servingJob{
  name: iservice.Labels[servingNameLabelKey],
  namespace: iservice.Namespace,
  servingType: p.processerType,
- version: iservice.Labels[servingVersionLabelKey],
+ version: version,
  deployment: nil,
  pods: filterPods,
  services: services,

diff --git a/pkg/serving/update.go b/pkg/serving/update.go
@@ -426,7 +426,7 @@ func findAndBuildInferenceService(args *types.UpdateKServeArgs) (*kservev1beta1.
  return nil, err
  }
 
- inferenceName := fmt.Sprintf("%s-%s", args.Name, args.Version)
+ inferenceName := args.Name
  inferenceService, err := kubectl.GetInferenceService(inferenceName, args.Namespace)
  if err != nil {
  return nil, err