Merge pull request #363 from becitsthere/master

Correctly compare version with pre-release tag
neuvector · Jan 26, 2024 · caa31c7 · caa31c7
2 parents 266cad5 + a9ee888
commit caa31c7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/charts/core/Chart.yaml b/charts/core/Chart.yaml
@@ -1,6 +1,6 @@
 name: core
 apiVersion: v1
-version: 2.7.0
+version: 2.7.1
 appVersion: 5.2.4-s1
 description: Helm chart for NeuVector's core services
 home: https://neuvector.com

diff --git a/charts/core/templates/controller-deployment.yaml b/charts/core/templates/controller-deployment.yaml
@@ -1,6 +1,6 @@
 {{- $pre530 := false -}}
 {{- if regexMatch "^[0-9]+\\.[0-9]+\\.[0-9]+" .Values.tag }}
-{{- $pre530 = (semverCompare "<5.2.10" .Values.tag) -}}
+{{- $pre530 = (semverCompare "<5.2.10-0" .Values.tag) -}}
 {{- end }}
 {{- if .Values.controller.enabled -}}
 {{- if (semverCompare ">=1.9-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}

diff --git a/charts/core/templates/enforcer-daemonset.yaml b/charts/core/templates/enforcer-daemonset.yaml
@@ -1,6 +1,6 @@
 {{- $pre530 := false -}}
 {{- if regexMatch "^[0-9]+\\.[0-9]+\\.[0-9]+" .Values.tag }}
-{{- $pre530 = (semverCompare "<5.2.10" .Values.tag) -}}
+{{- $pre530 = (semverCompare "<5.2.10-0" .Values.tag) -}}
 {{- end }}
 {{- $runtimePath := "" -}}
 {{- if .Values.runtimePath }}

diff --git a/charts/crd/Chart.yaml b/charts/crd/Chart.yaml
@@ -1,6 +1,6 @@
 name: crd
 apiVersion: v1
-version: 2.7.0
+version: 2.7.1
 appVersion: 5.2.4-s1
 description: Helm chart for NeuVector's CRD services
 home: https://neuvector.com

diff --git a/charts/monitor/Chart.yaml b/charts/monitor/Chart.yaml
@@ -1,6 +1,6 @@
 name: monitor
 apiVersion: v1
-version: 2.7.0
+version: 2.7.1
 appVersion: 5.2.4-s1
 description: Helm chart for NeuVector monitor services
 home: https://neuvector.com

diff --git a/test/deployment_test.go b/test/deployment_test.go
@@ -34,7 +34,7 @@ func TestControllerDeploymentPre53(t *testing.T) {
 
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"tag": "5.2.4",
+			"tag": "5.2.4-s1",
 		},
 	}