Merge pull request #1548 from daemon1024/chore-tests-cleanup

chore(tests): cleanup unused code and add sleep to prevent flakiness

tests/k8s_env/block/block_test.go

@@ -27,18 +27,12 @@ var _ = BeforeSuite(func() {
 	// delete all KSPs
 	err = DeleteAllKsp()
 	Expect(err).To(BeNil())
-
-	// enable kubearmor port forwarding
-	err = KubearmorPortForward()
-	Expect(err).To(BeNil())
 })
 
 var _ = AfterSuite(func() {
 	// delete wordpress-mysql app
 	err := K8sDelete([]string{"res/wordpress-mysql-deployment.yaml"})
 	Expect(err).To(BeNil())
-
-	KubearmorPortForwardStop()
 })
 
 func getWpsqlPod(name string, ant string) string {
@@ -96,6 +90,9 @@ var _ = Describe("Posture", func() {
 			err := K8sApplyFile("res/ksp-wordpress-allow-file.yaml")
 			Expect(err).To(BeNil())
 
+			// wait for policy creation, added due to flaky behaviour
+			time.Sleep(5 * time.Second)
+
 			// Start Kubearmor Logs
 			err = KarmorLogStart("policy", "wordpress-mysql", "File", wp)
 			Expect(err).To(BeNil())

tests/k8s_env/configmap/kubearmor_config_test.go

@@ -21,14 +21,9 @@ var _ = BeforeSuite(func() {
 	// delete all KSPs
 	err = DeleteAllKsp()
 	Expect(err).To(BeNil())
-
-	// enable kubearmor port forwarding
-	err = KubearmorPortForward()
-	Expect(err).To(BeNil())
 })
 
 var _ = AfterSuite(func() {
-	KubearmorPortForwardStop()
 	cm := NewDefaultConfigMapData()
 	cm.DefaultFilePosture = "block"
 	cm.DefaultCapabilitiesPosture = "block"
@@ -87,6 +82,10 @@ var _ = Describe("KubeArmor-Config", func() {
 			// default global visibility is none
 			cm := NewDefaultConfigMapData()
 			err := cm.CreateKAConfigMap()
+			Expect(err).To(BeNil())
+
+			// wait for visibility maps to be updated in kernel, added due to flaky behaviour
+			time.Sleep(5 * time.Second)
 
 			err = KarmorLogStart("all", "unannotated", "", unannotated)
 			Expect(err).To(BeNil())
@@ -106,6 +105,9 @@ var _ = Describe("KubeArmor-Config", func() {
 			err = cm.CreateKAConfigMap()
 			Expect(err).To(BeNil())
 
+			// wait for visibility maps to be updated in kernel, added due to flaky behaviour
+			time.Sleep(5 * time.Second)
+
 			err = KarmorLogStart("all", "unannotated", "", unannotated)
 			Expect(err).To(BeNil())
 
@@ -245,6 +247,7 @@ var _ = Describe("KubeArmor-Config", func() {
 			// default global visibility is none
 			cm := NewDefaultConfigMapData()
 			err := cm.CreateKAConfigMap()
+			Expect(err).To(BeNil())
 
 			err = KarmorLogStart("all", "fullyannotated", "", fullyAnnotated)
 			Expect(err).To(BeNil())

tests/k8s_env/ksp/ksp_test.go

@@ -25,19 +25,12 @@ var _ = BeforeSuite(func() {
 	// delete all KSPs
 	err = DeleteAllKsp()
 	Expect(err).To(BeNil())
-
-	// enable kubearmor port forwarding
-	err = KubearmorPortForward()
-	Expect(err).To(BeNil())
-
 })
 
 var _ = AfterSuite(func() {
 	// delete multiubuntu deployment
 	err := K8sDelete([]string{"multiubuntu/multiubuntu-deployment.yaml"})
 	Expect(err).To(BeNil())
-
-	KubearmorPortForwardStop()
 })
 
 func getUbuntuPod(name string, ant string) string {

tests/k8s_env/multicontainer/multicontainer_test.go

@@ -19,17 +19,12 @@ var _ = BeforeSuite(func() {
 
 	// delete all KSPs
 	KspDeleteAll()
-
-	// enable kubearmor port forwarding
-	err = KubearmorPortForward()
-	Expect(err).To(BeNil())
 })
 
 var _ = AfterSuite(func() {
 	// delete wordpress-mysql app from multicontainer ns
 	err := K8sDelete([]string{"manifests/multicontainer-deployment.yaml"})
 	Expect(err).To(BeNil())
-	KubearmorPortForwardStop()
 })
 
 func getMultiContainerPod(name string, ant string) string {

tests/k8s_env/smoke/smoke_test.go

@@ -20,18 +20,12 @@ var _ = BeforeSuite(func() {
 	// delete all KSPs
 	err = DeleteAllKsp()
 	Expect(err).To(BeNil())
-
-	// enable kubearmor port forwarding
-	err = KubearmorPortForward()
-	Expect(err).To(BeNil())
 })
 
 var _ = AfterSuite(func() {
 	// Delete wordpress-mysql app
 	err := K8sDelete([]string{"res/wordpress-mysql-deployment.yaml"})
 	Expect(err).To(BeNil())
-
-	KubearmorPortForwardStop()
 })
 
 func getWpsqlPod(name string, ant string) string {

tests/k8s_env/syscalls/syscalls_test.go

@@ -20,18 +20,12 @@ var _ = BeforeSuite(func() {
 
 	// delete all KSPs
 	KspDeleteAll()
-
-	// enable kubearmor port forwarding
-	err = KubearmorPortForward()
-	Expect(err).To(BeNil())
-
 })
 
 var _ = AfterSuite(func() {
 	// delete wordpress-mysql app from syscalls ns
 	err := K8sDelete([]string{"manifests/ubuntu-deployment.yaml"})
 	Expect(err).To(BeNil())
-	KubearmorPortForwardStop()
 })
 
 func getUbuntuPod(name string, ant string) string {

tests/k8s_env/visibility/visibility_test.go

@@ -21,18 +21,12 @@ var _ = BeforeSuite(func() {
 	// delete all KSPs
 	err = DeleteAllKsp()
 	Expect(err).To(BeNil())
-
-	// enable kubearmor port forwarding
-	err = KubearmorPortForward()
-	Expect(err).To(BeNil())
 })
 
 var _ = AfterSuite(func() {
 	// delete wordpress-mysql app
 	err := K8sDelete([]string{"../smoke/res/wordpress-mysql-deployment.yaml"})
 	Expect(err).To(BeNil())
-
-	KubearmorPortForwardStop()
 })
 
 func getWpsqlPod(name string, ant string) string {

tests/util/kartutil.go

@@ -36,7 +36,6 @@ import (
 
 var k8sClient *kcli.Client
 var kcClient *kc.SecurityV1Client
-var stopChan chan struct{}
 
 // ConfigMapData hosts the structure which is used to configure Config Map Data
 type ConfigMapData struct {
@@ -434,7 +433,7 @@ func DeleteAllKsp() error {
 		for _, k := range ksp.Items {
 			err = k8sClient.KSPClientset.KubeArmorPolicies(ns.Name).Delete(context.TODO(), k.Name, metav1.DeleteOptions{})
 			if err != nil {
-				log.Errorf("error deleting ksp %s in the namespace %s", k.Name, &ns.Name)
+				log.Errorf("error deleting ksp %s in the namespace %s", k.Name, ns.Name)
 				return err
 			}
 			log.Printf("deleted ksp %s in the namespace %s", k.Name, ns.Name)