Adapt to v2 by migrating use of extensions/table package

Author: bparees

test/extended/networking/tuning.go

@@ -7,7 +7,6 @@ import (
 	"time"
 
 	g "github.com/onsi/ginkgo/v2"
-	t "github.com/onsi/ginkgo/v2/extensions/table"
 	o "github.com/onsi/gomega"
 
 	kapiv1 "k8s.io/api/core/v1"
@@ -79,7 +78,7 @@ var _ = g.Describe("[sig-network][Feature:tuning]", func() {
 			o.Expect(result).To(o.Equal(sysctl.Value), "incorrect sysctl value")
 		}
 	})
-	t.DescribeTable("pod should not start for sysctls not on whitelist", func(sysctl, value string) {
+	g.DescribeTable("pod should not start for sysctls not on whitelist", func(sysctl, value string) {
 		namespace := f.Namespace.Name
 		tuningNADName := "tuningnadwithdisallowedsysctls"
 		err := createTuningNAD(oc.AdminConfig(), namespace, tuningNADName, map[string]string{sysctl: value})
@@ -101,8 +100,8 @@ var _ = g.Describe("[sig-network][Feature:tuning]", func() {
 			return pod.Status.Phase
 		}, 15*time.Second, 3*time.Second).Should(o.Equal(kapiv1.PodPending))
 	},
-		t.Entry("net.ipv4.conf.all.send_redirects", "net.ipv4.conf.all.send_redirects", "1"),
-		t.Entry("net.ipv4.conf.IFNAME.arp_filter", "net.ipv4.conf.IFNAME.arp_filter", "1"),
+		g.Entry("net.ipv4.conf.all.send_redirects", "net.ipv4.conf.all.send_redirects", "1"),
+		g.Entry("net.ipv4.conf.IFNAME.arp_filter", "net.ipv4.conf.IFNAME.arp_filter", "1"),
 	)
 
 	g.It("pod sysctls should not affect node", func() {

test/extended/oauth/server_headers.go

@@ -6,7 +6,6 @@ import (
 	"net/url"
 
 	g "github.com/onsi/ginkgo/v2"
-	t "github.com/onsi/ginkgo/v2/extensions/table"
 	o "github.com/onsi/gomega"
 
 	"k8s.io/client-go/rest"
@@ -40,7 +39,7 @@ var _ = g.Describe("[sig-auth][Feature:OAuthServer] [Headers][apigroup:route.ope
 		oauthServerCleanup()
 	})
 
-	t.DescribeTable("expected headers returned from the",
+	g.DescribeTable("expected headers returned from the",
 		func(path string) {
 			checkUrl, err := url.Parse(oauthServerAddr)
 			o.Expect(err).ToNot(o.HaveOccurred())
@@ -93,14 +92,14 @@ var _ = g.Describe("[sig-auth][Feature:OAuthServer] [Headers][apigroup:route.ope
 
 			o.Expect(resp.Header).To(o.Equal(allHeaders))
 		},
-		t.Entry("root URL", "/"),
-		t.Entry("login URL for when there is only one IDP", "/login"),
-		t.Entry("login URL for the bootstrap IDP", "/login/kube:admin"),
-		t.Entry("login URL for the allow all IDP", "/login/anypassword"),
-		t.Entry("logout URL", "/logout"),
-		t.Entry("token URL", "/oauth/token"),
-		t.Entry("authorize URL", "/oauth/authorize"),
-		t.Entry("grant URL", "/oauth/authorize/approve"),
-		t.Entry("token request URL", "/oauth/token/request"),
+		g.Entry("root URL", "/"),
+		g.Entry("login URL for when there is only one IDP", "/login"),
+		g.Entry("login URL for the bootstrap IDP", "/login/kube:admin"),
+		g.Entry("login URL for the allow all IDP", "/login/anypassword"),
+		g.Entry("logout URL", "/logout"),
+		g.Entry("token URL", "/oauth/token"),
+		g.Entry("authorize URL", "/oauth/authorize"),
+		g.Entry("grant URL", "/oauth/authorize/approve"),
+		g.Entry("token request URL", "/oauth/token/request"),
 	)
 })

test/extended/security/sysctl.go

@@ -5,7 +5,6 @@ import (
 	"time"
 
 	g "github.com/onsi/ginkgo/v2"
-	t "github.com/onsi/ginkgo/v2/extensions/table"
 	o "github.com/onsi/gomega"
 
 	v1 "k8s.io/api/core/v1"
@@ -19,7 +18,7 @@ import (
 
 var _ = g.Describe("[sig-arch] [Conformance] sysctl", func() {
 	oc := exutil.NewCLIWithPodSecurityLevel("sysctl", admissionapi.LevelPrivileged)
-	t.DescribeTable("whitelists", func(sysctl, value, path, defaultSysctlValue string) {
+	g.DescribeTable("whitelists", func(sysctl, value, path, defaultSysctlValue string) {
 		f := oc.KubeFramework()
 		var preexistingPod *v1.Pod
 		var err error
@@ -75,14 +74,14 @@ var _ = g.Describe("[sig-arch] [Conformance] sysctl", func() {
 			o.Expect(podOutput).Should(o.Equal(defaultSysctlValue))
 		})
 	},
-		t.Entry("kernel.shm_rmid_forced", "kernel.shm_rmid_forced", "1", "/proc/sys/kernel/shm_rmid_forced", "0"),
-		t.Entry("net.ipv4.ip_local_port_range", "net.ipv4.ip_local_port_range", "32769\t61001", "/proc/sys/net/ipv4/ip_local_port_range", "32768\t60999"),
-		t.Entry("net.ipv4.tcp_syncookies", "net.ipv4.tcp_syncookies", "0", "/proc/sys/net/ipv4/tcp_syncookies", "1"),
-		t.Entry("net.ipv4.ping_group_range", "net.ipv4.ping_group_range", "1\t0", "/proc/sys/net/ipv4/ping_group_range", "0\t2147483647"),
-		t.Entry("net.ipv4.ip_unprivileged_port_start", "net.ipv4.ip_unprivileged_port_start", "1002", "/proc/sys/net/ipv4/ip_unprivileged_port_start", "1024"),
+		g.Entry("kernel.shm_rmid_forced", "kernel.shm_rmid_forced", "1", "/proc/sys/kernel/shm_rmid_forced", "0"),
+		g.Entry("net.ipv4.ip_local_port_range", "net.ipv4.ip_local_port_range", "32769\t61001", "/proc/sys/net/ipv4/ip_local_port_range", "32768\t60999"),
+		g.Entry("net.ipv4.tcp_syncookies", "net.ipv4.tcp_syncookies", "0", "/proc/sys/net/ipv4/tcp_syncookies", "1"),
+		g.Entry("net.ipv4.ping_group_range", "net.ipv4.ping_group_range", "1\t0", "/proc/sys/net/ipv4/ping_group_range", "0\t2147483647"),
+		g.Entry("net.ipv4.ip_unprivileged_port_start", "net.ipv4.ip_unprivileged_port_start", "1002", "/proc/sys/net/ipv4/ip_unprivileged_port_start", "1024"),
 	)
 
-	t.DescribeTable("pod should not start for sysctl not on whitelist", func(sysctl, value string) {
+	g.DescribeTable("pod should not start for sysctl not on whitelist", func(sysctl, value string) {
 		f := oc.KubeFramework()
 		podDefinition := frameworkpod.NewAgnhostPod(f.Namespace.Name, "sysctl-pod", nil, nil, nil)
 		podDefinition.Spec.SecurityContext.Sysctls = []v1.Sysctl{{Name: sysctl, Value: value}}
@@ -97,7 +96,7 @@ var _ = g.Describe("[sig-arch] [Conformance] sysctl", func() {
 		})
 		o.Expect(err).NotTo(o.HaveOccurred(), "should not be able to create pod")
 	},
-		t.Entry("kernel.msgmax", "kernel.msgmax", "1000"),
-		t.Entry("net.ipv4.ip_dynaddr", "net.ipv4.ip_dynaddr", "1"),
+		g.Entry("kernel.msgmax", "kernel.msgmax", "1000"),
+		g.Entry("net.ipv4.ip_dynaddr", "net.ipv4.ip_dynaddr", "1"),
 	)
 })