chart: fix parsing image tag when the image url contains a port (#3644)

* chart: fix parsing image tag when the image url contains a port * chart: handle image tag which is a non-semantic version --------- Signed-off-by: zhangzujian <[email protected]>
kubeovn · Jan 22, 2024 · d4a815d · d4a815d
1 parent b2dead0
commit d4a815d
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/charts/templates/_helpers.tpl b/charts/templates/_helpers.tpl
@@ -33,12 +33,20 @@ Number of master nodes
 {{- define "kubeovn.ovs-ovn.updateStrategy" -}}
   {{- $ds := lookup "apps/v1" "DaemonSet" $.Values.namespace "ovs-ovn" -}}
   {{- if $ds -}}
-    {{- $updateStrategy := $ds.spec.updateStrategy.type }}
-    {{- $imageVersion := index ((index $ds.spec.template.spec.containers 0).image | splitList ":") 1 | trimPrefix "v" }}
-    {{- if or (eq $updateStrategy "RollingUpdate") (semverCompare ">= 1.12.0" $imageVersion) -}}
+    {{- if eq $ds.spec.updateStrategy.type "RollingUpdate" -}}
       RollingUpdate
     {{- else -}}
-      OnDelete
+      {{- $imageVersion := (index $ds.spec.template.spec.containers 0).image | splitList ":" | last | trimPrefix "v" -}}
+      {{- $versionRegex := `^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)` -}}
+      {{- if regexMatch $versionRegex $imageVersion -}}
+        {{- if regexFind $versionRegex $imageVersion | semverCompare ">= 1.12.0" -}}
+          RollingUpdate
+        {{- else -}}
+          OnDelete
+        {{- end -}}
+      {{- else -}}
+        OnDelete
+      {{- end -}}
     {{- end -}}
   {{- else -}}
     RollingUpdate