v2.5.1

README.md

@@ -8,7 +8,7 @@
 
 ## 1.安装好Nvidia的驱动程序 >440 <570
 
-- 在所有安装了GPU的服务器上都要确保nvidia-smi命令运行正常，驱动版本>440 <570 ,推荐535 
+- 在所有安装了GPU的服务器上都要确保nvidia-smi命令运行正常，驱动版本>440 ,推荐官网最新驱动
   
   
 
@@ -42,8 +42,8 @@
 在master节点上运行：
 
 ```
-    # nerdctl -nk8s.io load -i hami250.tar
-    # nerdctl -nk8s.io push sealos.hub:5000/projecthami/hami:v2.5.0
+    # nerdctl -nk8s.io load -i hami251.tar
+    # nerdctl -nk8s.io push sealos.hub:5000/projecthami/hami:v2.5.1
     # nerdctl -nk8s.io load -i scheduler1-28-9.tar
     # nerdctl -nk8s.io push sealos.hub:5000/google_containers/kube-scheduler:v1.28.9
     # nerdctl -nk8s.io load -i kube-webhook-certgen.tar

helm/hami/Chart.yaml

@@ -1,10 +1,10 @@
 apiVersion: v2
-appVersion: 2.5.0
+appVersion: 2.5.1
 description: Heterogeneous AI Computing Virtualization Middleware
 keywords:
 - vgpu
 - gpu
-kubeVersion: '>= 1.16.0'
+kubeVersion: '>= 1.18.0'
 maintainers:
 - email: limengxuan@4paradigm.com
   name: limengxuan
@@ -12,4 +12,4 @@ maintainers:
   name: zhangxiao
 name: hami
 type: application
-version: 2.5.0
+version: 2.5.1

helm/hami/templates/_helpers.tpl

@@ -98,11 +98,11 @@ imagePullSecrets: {{ toYaml .Values.imagePullSecrets | nindent 2 }}
 
 
 {{/*
-    Remove the part after the `+` in the Kubernetes version string.
+    Return the stripped Kubernetes version string by removing extra parts after semantic version number.
     v1.31.1+k3s1 -> v1.31.1
+    v1.30.8-eks-2d5f260 -> v1.30.8
     v1.31.1 -> v1.31.1
 */}}
 {{- define "strippedKubeVersion" -}}
-{{- $parts := split "+" .Capabilities.KubeVersion.Version -}}
-{{- print $parts._0 -}}
+{{ regexReplaceAll "^(v[0-9]+\\.[0-9]+\\.[0-9]+)(.*)$" .Capabilities.KubeVersion.Version "$1" }}
 {{- end -}}

helm/hami/templates/scheduler/configmapnew.yaml

@@ -8,7 +8,7 @@ metadata:
     {{- include "hami-vgpu.labels" . | nindent 4 }}
 data:
   config.yaml: |
-    {{- if gt (.Capabilities.KubeVersion.Minor | int) 25}}
+    {{- if gt (regexReplaceAll "[^0-9]" .Capabilities.KubeVersion.Minor "" | int) 25}}
     apiVersion: kubescheduler.config.k8s.io/v1
     {{- else }}
     apiVersion: kubescheduler.config.k8s.io/v1beta2

helm/hami/templates/scheduler/deployment.yaml

@@ -37,7 +37,7 @@ spec:
           imagePullPolicy: {{ .Values.scheduler.kubeScheduler.imagePullPolicy | quote }}
           command:
             - kube-scheduler
-             {{- if ge (.Capabilities.KubeVersion.Minor | int) 22 }}
+             {{- if ge (regexReplaceAll "[^0-9]" .Capabilities.KubeVersion.Minor "" | int) 22 }}
             {{- range .Values.scheduler.kubeScheduler.extraNewArgs }}
             - {{ . }}
             {{- end }}
@@ -132,7 +132,7 @@ spec:
         {{- if .Values.scheduler.kubeScheduler.enabled }}
         - name: scheduler-config
           configMap:
-            {{- if ge (.Capabilities.KubeVersion.Minor | int) 22 }}
+            {{- if ge (regexReplaceAll "[^0-9]" .Capabilities.KubeVersion.Minor "" | int) 22 }}
             name: {{ template "hami-vgpu.scheduler" . }}-newversion
             {{- else }}
             name: {{ template "hami-vgpu.scheduler" . }}

helm/hami/templates/scheduler/job-patch/job-createSecret.yaml

@@ -30,7 +30,7 @@ spec:
       {{- end }}
       containers:
         - name: create
-           {{- if ge (.Capabilities.KubeVersion.Minor | int) 22 }}
+           {{- if ge (regexReplaceAll "[^0-9]" .Capabilities.KubeVersion.Minor "" | int) 22 }}
           image: {{ .Values.scheduler.patch.imageNew }}
           {{- else }}
           image: {{ .Values.scheduler.patch.image }}

helm/hami/templates/scheduler/job-patch/job-patchWebhook.yaml

@@ -30,7 +30,7 @@ spec:
       {{- end }}
       containers:
         - name: patch
-          {{- if ge (.Capabilities.KubeVersion.Minor | int) 22 }}
+          {{- if ge (regexReplaceAll "[^0-9]" .Capabilities.KubeVersion.Minor "" | int) 22 }}
           image: {{ .Values.scheduler.patch.imageNew }}
           {{- else }}
           image: {{ .Values.scheduler.patch.image }}

helm/hami/values.yaml

@@ -3,7 +3,7 @@
 nameOverride: ""
 fullnameOverride: ""
 imagePullSecrets: [ ]
-version: "v2.5.0"
+version: "v2.5.1"
 
 #Nvidia GPU Parameters
 resourceName: "nvidia.com/gpu"
@@ -136,7 +136,7 @@ devicePlugin:
   runtimeClassName: ""
   migStrategy: "none"
   disablecorelimit: "false"
-  passDeviceSpecsEnabled: true
+  passDeviceSpecsEnabled: false
   extraArgs:
     - -v=4