NVSHAS-8597: Treat non-semantic versioning as post 5.3

becitsthere · becitsthere · commit fa29075f3be7 · 2024-01-12T01:20:50.000Z
diff --git a/charts/core/templates/controller-deployment.yaml b/charts/core/templates/controller-deployment.yaml
@@ -1,4 +1,7 @@
+{{- $pre530 := false -}}
+{{- if regexMatch "^[0-9]+\\.[0-9]+\\.[0-9]+" .Values.tag }}
 {{- $pre530 := (semverCompare "<5.2.10" .Values.tag) -}}
+{{- end }}
 {{- if .Values.controller.enabled -}}
 {{- if (semverCompare ">=1.9-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
 apiVersion: apps/v1
diff --git a/charts/core/templates/enforcer-daemonset.yaml b/charts/core/templates/enforcer-daemonset.yaml
@@ -1,4 +1,7 @@
+{{- $pre530 := false -}}
+{{- if regexMatch "^[0-9]+\\.[0-9]+\\.[0-9]+" .Values.tag }}
 {{- $pre530 := (semverCompare "<5.2.10" .Values.tag) -}}
+{{- end }}
 {{- if .Values.enforcer.enabled -}}
 {{- if (semverCompare ">=1.9-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
 apiVersion: apps/v1
diff --git a/test/daemonset_test.go b/test/daemonset_test.go
@@ -14,7 +14,6 @@ func TestEnforcerDaemonset(t *testing.T) {
 		SetValues: map[string]string{},
 	}
 
-	// Test ingress
 	out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/enforcer-daemonset.yaml"})
 	outs := splitYaml(out)
 
@@ -23,6 +22,29 @@ func TestEnforcerDaemonset(t *testing.T) {
 	}
 }
 
+func TestEnforcerDaemonsetPost53(t *testing.T) {
+	helmChartPath := "../charts/core"
+
+	options := &helm.Options{
+		SetValues: map[string]string{
+			"tag": "latest",
+		},
+	}
+
+	out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/enforcer-daemonset.yaml"})
+	outs := splitYaml(out)
+
+	if len(outs) != 1 {
+		t.Errorf("Resource count is wrong. count=%v\n", len(outs))
+	}
+
+	var ds appsv1.DaemonSet
+	helm.UnmarshalK8SYaml(t, outs[0], &ds)
+	if ds.Spec.Template.Spec.Containers[0].VolumeMounts[0].Name != "modules-vol" {
+		t.Errorf("VolumeMounts[0] is wrong, %v\n", ds.Spec.Template.Spec.Containers[0].VolumeMounts[0])
+	}
+}
+
 func TestEnforcerDaemonsetRuntime(t *testing.T) {
 	helmChartPath := "../charts/core"
 
@@ -33,7 +55,6 @@ func TestEnforcerDaemonsetRuntime(t *testing.T) {
 		},
 	}
 
-	// Test ingress
 	out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/enforcer-daemonset.yaml"})
 	outs := splitYaml(out)
 
@@ -75,7 +96,6 @@ func TestEnforcerDaemonsetLeastPrivilege(t *testing.T) {
 		},
 	}
 
-	// Test ingress
 	out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/enforcer-daemonset.yaml"})
 	outs := splitYaml(out)
 
diff --git a/test/deployment_test.go b/test/deployment_test.go
@@ -21,7 +21,6 @@ func TestControllerDeployment(t *testing.T) {
 		},
 	}
 
-	// Test ingress
 	out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/controller-deployment.yaml"})
 	outs := splitYaml(out)
 
@@ -39,7 +38,6 @@ func TestControllerDeploymentPre53(t *testing.T) {
 		},
 	}
 
-	// Test ingress
 	out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/controller-deployment.yaml"})
 	outs := splitYaml(out)
 
@@ -66,7 +64,6 @@ func TestControllerDeploymentPost53(t *testing.T) {
 		},
 	}
 
-	// Test ingress
 	out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/controller-deployment.yaml"})
 	outs := splitYaml(out)
 
@@ -97,7 +94,6 @@ func TestControllerDeploymentRegistry(t *testing.T) {
 		},
 	}
 
-	// Test ingress
 	out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/controller-deployment.yaml"})
 	outs := splitYaml(out)
 
@@ -124,7 +120,6 @@ func TestControllerDeploymentOEM(t *testing.T) {
 		},
 	}
 
-	// Test ingress
 	out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/controller-deployment.yaml"})
 	outs := splitYaml(out)
 
@@ -149,7 +144,6 @@ func TestControllerDeploymentCert(t *testing.T) {
 		},
 	}
 
-	// Test ingress
 	out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/controller-deployment.yaml"})
 	outs := splitYaml(out)
 
@@ -168,7 +162,6 @@ func TestControllerDeploymentDisrupt(t *testing.T) {
 		},
 	}
 
-	// Test ingress
 	out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/controller-deployment.yaml"})
 	outs := splitYaml(out)
 

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ func TestControllerDeployment(t *testing.T) {`
`21`	`21`	`},`
`22`	`22`	`}`
`23`	`23`
`24`		`- // Test ingress`
`25`	`24`	`out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/controller-deployment.yaml"})`
`26`	`25`	`outs := splitYaml(out)`
`27`	`26`
`@@ -39,7 +38,6 @@ func TestControllerDeploymentPre53(t *testing.T) {`
`39`	`38`	`},`
`40`	`39`	`}`
`41`	`40`
`42`		`- // Test ingress`
`43`	`41`	`out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/controller-deployment.yaml"})`
`44`	`42`	`outs := splitYaml(out)`
`45`	`43`
`@@ -66,7 +64,6 @@ func TestControllerDeploymentPost53(t *testing.T) {`
`66`	`64`	`},`
`67`	`65`	`}`
`68`	`66`
`69`		`- // Test ingress`
`70`	`67`	`out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/controller-deployment.yaml"})`
`71`	`68`	`outs := splitYaml(out)`
`72`	`69`
`@@ -97,7 +94,6 @@ func TestControllerDeploymentRegistry(t *testing.T) {`
`97`	`94`	`},`
`98`	`95`	`}`
`99`	`96`
`100`		`- // Test ingress`
`101`	`97`	`out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/controller-deployment.yaml"})`
`102`	`98`	`outs := splitYaml(out)`
`103`	`99`
`@@ -124,7 +120,6 @@ func TestControllerDeploymentOEM(t *testing.T) {`
`124`	`120`	`},`
`125`	`121`	`}`
`126`	`122`
`127`		`- // Test ingress`
`128`	`123`	`out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/controller-deployment.yaml"})`
`129`	`124`	`outs := splitYaml(out)`
`130`	`125`
`@@ -149,7 +144,6 @@ func TestControllerDeploymentCert(t *testing.T) {`
`149`	`144`	`},`
`150`	`145`	`}`
`151`	`146`
`152`		`- // Test ingress`
`153`	`147`	`out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/controller-deployment.yaml"})`
`154`	`148`	`outs := splitYaml(out)`
`155`	`149`
`@@ -168,7 +162,6 @@ func TestControllerDeploymentDisrupt(t *testing.T) {`
`168`	`162`	`},`
`169`	`163`	`}`
`170`	`164`
`171`		`- // Test ingress`
`172`	`165`	`out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/controller-deployment.yaml"})`
`173`	`166`	`outs := splitYaml(out)`
`174`	`167`