Fix version check with non semver versions

closes neuvector#361 Signed-off-by: Sylvain Desbureaux <[email protected]>
sylvainOL · Jan 25, 2024 · 0c390f7 · 0c390f7
1 parent 266cad5
commit 0c390f7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/charts/core/templates/enforcer-daemonset.yaml b/charts/core/templates/enforcer-daemonset.yaml
@@ -1,6 +1,7 @@
 {{- $pre530 := false -}}
 {{- if regexMatch "^[0-9]+\\.[0-9]+\\.[0-9]+" .Values.tag }}
-{{- $pre530 = (semverCompare "<5.2.10" .Values.tag) -}}
+{{- $semVerVersion := regexFind "^[0-9]+\\.[0-9]+\\.[0-9]+" .Values.tag }}
+{{- $pre530 = (semverCompare "<5.2.10" $semVerVersion) -}}
 {{- end }}
 {{- $runtimePath := "" -}}
 {{- if .Values.runtimePath }}

diff --git a/test/daemonset_test.go b/test/daemonset_test.go
@@ -50,7 +50,7 @@ func TestEnforcerDaemonsetRuntimePre53(t *testing.T) {
 
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"tag":          "5.2.0",
+			"tag":          "5.2.0-s1",
 			"crio.enabled": "true",
 			"crio.path":    "/var/run/crio.sock",
 		},