removed psp related hull test cases

rancher · Mar 18, 2024 · 3ce6d47 · 3ce6d47
1 parent c2314ba
commit 3ce6d47
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 133 deletions.
diff --git a/tests/common/global_psp_checks.go b/tests/common/global_psp_checks.go
diff --git a/tests/rancher-cis-benchmark/rancher_cis_benchmark.go b/tests/rancher-cis-benchmark/rancher_cis_benchmark.go
@@ -54,18 +54,6 @@ var suite = test.Suite{
 			TemplateOptions: chart.NewTemplateOptions(DefaultReleaseName, DefaultNamespace).
 				Set("nodeSelector", testNodeSelector),
 		},
-		{
-			Name: "Set .Values.global.cattle.psp.enabled to true",
-
-			TemplateOptions: chart.NewTemplateOptions(DefaultReleaseName, DefaultNamespace).
-				Set("global.cattle.psp.enabled", true),
-		},
-		{
-			Name: "Set .Values.global.cattle.psp.enabled to false",
-
-			TemplateOptions: chart.NewTemplateOptions(DefaultReleaseName, DefaultNamespace).
-				Set("global.cattle.psp.enabled", false),
-		},
 		{
 			Name: "Set Values.global.cattle.clusterName",
 
@@ -323,14 +311,6 @@ var suite = test.Suite{
 				patchSaJobExistsCheck,
 			},
 		},
-		{
-
-			Name: "PSPs Are Created And Referenced As Per .Values.global.cattle.psp.enabled field",
-			Covers: []string{
-				".Values.global.cattle.psp.enabled",
-			},
-			Checks: common.EnsurePSPsExist(1),
-		},
 		{
 
 			Name: "Check cisoperator image repository and tag",

diff --git a/tests/rancher-istio/rancher_istio.go b/tests/rancher-istio/rancher_istio.go
@@ -37,20 +37,6 @@ var suite = test.Suite{
 					"global.cattle.systemDefaultRegistry", "testRegistry",
 				),
 		},
-
-		{
-			Name: "Set .Values.global.cattle.psp.enabled to true",
-
-			TemplateOptions: chart.NewTemplateOptions(DefaultReleaseName, DefaultNamespace).
-				Set("global.cattle.psp.enabled", true),
-		},
-		{
-			Name: "Set .Values.global.cattle.psp.enabled to false",
-
-			TemplateOptions: chart.NewTemplateOptions(DefaultReleaseName, DefaultNamespace).
-				Set("global.cattle.psp.enabled", false),
-		},
-
 		{
 			Name: "Set .Values.global.proxy",
 			TemplateOptions: chart.NewTemplateOptions(DefaultReleaseName, DefaultNamespace).
@@ -357,39 +343,6 @@ var suite = test.Suite{
 			},
 		},
 
-		{ //Set PSPs
-			Name: "Set PSPs",
-
-			Covers: []string{
-				".Values.global.cattle.psp.enabled",
-			},
-
-			Checks: test.Checks{
-				checker.PerResource(func(tc *checker.TestContext, cr *rbacv1.ClusterRole) {
-					pspsEnabled, _ := checker.RenderValue[bool](tc, ".Values.global.cattle.psp.enabled")
-					pspsFound := false
-					for _, rule := range cr.Rules {
-						for _, resource := range rule.Resources {
-							if resource == "podsecuritypolicies" {
-								pspsFound = true
-							}
-						}
-					}
-					if !pspsEnabled {
-						assert.False(tc.T, pspsFound, "ClusterRole %s has incorrect PSP configuration", cr.Name)
-					}
-				}),
-				checker.OnResources(func(tc *checker.TestContext, psps []*policyv1beta1.PodSecurityPolicy) {
-					pspsEnabled, _ := checker.RenderValue[bool](tc, ".Values.global.cattle.psp.enabled")
-					if pspsEnabled {
-						assert.Equal(tc.T, 5, len(psps), "Missing PSPs")
-					} else {
-						assert.Equal(tc.T, 0, len(psps), "Missing PSPs")
-					}
-				}),
-			},
-		},
-
 		{ // Setting forceInstall: true will remove the check for istio version < 1.6.x and will not analyze your install cluster prior to install
 			Name: "forceinstall",
 			Covers: []string{