Fix: Update handling of version strings in Helm template and helpers.…

…tpl (#845) * Update condition to include regexReplaceAll for outputting proper numbers from minor versions Signed-off-by: HJJ256 <[email protected]> * Update condition Signed-off-by: HJJ256 <[email protected]> * Update definition of strippedKubeVersion to handle variety of version numbering systems Signed-off-by: HJJ256 <[email protected]> * Update job-createSecret.yaml Signed-off-by: HJJ256 <[email protected]> * Update job-patchWebhook.yaml Signed-off-by: HJJ256 <[email protected]> --------- Signed-off-by: HJJ256 <[email protected]>
Project-HAMi · Feb 13, 2025 · 4b14ec7 · 4b14ec7
1 parent 2234fcf
commit 4b14ec7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/charts/hami/templates/_helpers.tpl b/charts/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 -}}
diff --git a/charts/hami/templates/scheduler/configmapnew.yaml b/charts/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

diff --git a/charts/hami/templates/scheduler/deployment.yaml b/charts/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" . }}

diff --git a/charts/hami/templates/scheduler/job-patch/job-createSecret.yaml b/charts/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 }}

diff --git a/charts/hami/templates/scheduler/job-patch/job-patchWebhook.yaml b/charts/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 }}