removed e2e tests for cgroups2 and associated functions

kubernetes · May 12, 2023 · c5dad5e · c5dad5e
1 parent 475adf7
commit c5dad5e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 137 deletions.
diff --git a/pkg/util/runtime/cpu_linux.go b/pkg/util/runtime/cpu_linux.go
@@ -60,10 +60,6 @@ func NumCPU() int {
 	return int(math.Ceil(float64(cpuQuota) / float64(cpuPeriod)))
 }
 
-func IsCgroupAvaliable() bool {
-	return true
-}
-
 func getCgroupVersion() int64 {
 	// /sys/fs/cgroup/cgroup.controllers will not exist with cgroupsv1
 	if _, err := os.Stat("/sys/fs/cgroup/cgroup.controllers"); err == nil {

diff --git a/pkg/util/runtime/cpu_notlinux.go b/pkg/util/runtime/cpu_notlinux.go
@@ -26,8 +26,4 @@ import (
 // NumCPU ...
 func NumCPU() int {
 	return runtime.NumCPU()
-}
-
-func IsCgroupAvaliable() bool {
-	return false
-}
+}
diff --git a/test/e2e/cgroups/cgroups_linux.go b/test/e2e/cgroups/cgroups_linux.go
diff --git a/test/e2e/cgroups/cgroups_notlinux.go b/test/e2e/cgroups/cgroups_notlinux.go
diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go
@@ -29,27 +29,26 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 
 	// tests to run
-	// _ "k8s.io/ingress-nginx/test/e2e/admission"
-	// _ "k8s.io/ingress-nginx/test/e2e/annotations"
-	// _ "k8s.io/ingress-nginx/test/e2e/annotations/modsecurity"
-	_ "k8s.io/ingress-nginx/test/e2e/cgroups"
-	// _ "k8s.io/ingress-nginx/test/e2e/dbg"
-	// _ "k8s.io/ingress-nginx/test/e2e/defaultbackend"
-	// _ "k8s.io/ingress-nginx/test/e2e/endpointslices"
-	// _ "k8s.io/ingress-nginx/test/e2e/gracefulshutdown"
-	// _ "k8s.io/ingress-nginx/test/e2e/ingress"
-	// _ "k8s.io/ingress-nginx/test/e2e/leaks"
-	// _ "k8s.io/ingress-nginx/test/e2e/loadbalance"
-	// _ "k8s.io/ingress-nginx/test/e2e/lua"
-	// _ "k8s.io/ingress-nginx/test/e2e/nginx"
-	// _ "k8s.io/ingress-nginx/test/e2e/security"
-	// _ "k8s.io/ingress-nginx/test/e2e/servicebackend"
-	// _ "k8s.io/ingress-nginx/test/e2e/settings"
-	// _ "k8s.io/ingress-nginx/test/e2e/settings/modsecurity"
-	// _ "k8s.io/ingress-nginx/test/e2e/settings/ocsp"
-	// _ "k8s.io/ingress-nginx/test/e2e/ssl"
-	// _ "k8s.io/ingress-nginx/test/e2e/status"
-	// _ "k8s.io/ingress-nginx/test/e2e/tcpudp"
+	_ "k8s.io/ingress-nginx/test/e2e/admission"
+	_ "k8s.io/ingress-nginx/test/e2e/annotations"
+	_ "k8s.io/ingress-nginx/test/e2e/annotations/modsecurity"
+	_ "k8s.io/ingress-nginx/test/e2e/dbg"
+	_ "k8s.io/ingress-nginx/test/e2e/defaultbackend"
+	_ "k8s.io/ingress-nginx/test/e2e/endpointslices"
+	_ "k8s.io/ingress-nginx/test/e2e/gracefulshutdown"
+	_ "k8s.io/ingress-nginx/test/e2e/ingress"
+	_ "k8s.io/ingress-nginx/test/e2e/leaks"
+	_ "k8s.io/ingress-nginx/test/e2e/loadbalance"
+	_ "k8s.io/ingress-nginx/test/e2e/lua"
+	_ "k8s.io/ingress-nginx/test/e2e/nginx"
+	_ "k8s.io/ingress-nginx/test/e2e/security"
+	_ "k8s.io/ingress-nginx/test/e2e/servicebackend"
+	_ "k8s.io/ingress-nginx/test/e2e/settings"
+	_ "k8s.io/ingress-nginx/test/e2e/settings/modsecurity"
+	_ "k8s.io/ingress-nginx/test/e2e/settings/ocsp"
+	_ "k8s.io/ingress-nginx/test/e2e/ssl"
+	_ "k8s.io/ingress-nginx/test/e2e/status"
+	_ "k8s.io/ingress-nginx/test/e2e/tcpudp"
 )
 
 // RunE2ETests checks configuration parameters (specified through flags) and then runs