chart: fix ovs-ovn update strategy

Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
kubeovn · Mar 29, 2024 · 17a4e69 · 17a4e69
1 parent 31968e8
commit 17a4e69
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/charts/kube-ovn/templates/_helpers.tpl b/charts/kube-ovn/templates/_helpers.tpl
@@ -36,9 +36,11 @@ Number of master nodes
     {{- if eq $ds.spec.updateStrategy.type "RollingUpdate" -}}
       RollingUpdate
     {{- else -}}
+      {{- $chartVersion := index $ds.metadata.annotations "chart-version" }}
+      {{- $newChartVersion := printf "%s-%s" .Chart.Name .Chart.Version }}
       {{- $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 (ne $newChartVersion $chartVersion) and (regexMatch $versionRegex $imageVersion) -}}
         {{- if regexFind $versionRegex $imageVersion | semverCompare ">= 1.12.0" -}}
           RollingUpdate
         {{- else -}}