chore: update Ginkgo labels to use full domain names for consistency

dspo · dspo · commit 9f8890a957c2 · 2025-06-25T14:51:29.000+08:00
- Replaced shorthand labels like "apisix" and "networking" with "apisix.apache.org" and "networking.k8s.io" respectively across E2E test cases.
- Adjusted GitHub Actions workflows to reflect updated labels.
diff --git a/.github/workflows/apisix-e2e-test.yml b/.github/workflows/apisix-e2e-test.yml
@@ -41,8 +41,8 @@ jobs:
         - apisix-standalone
         - apisix
         cases_subset:
-        - apisix
-        - networking
+        - apisix.apache.org
+        - networking.k8s.io
     runs-on: buildjet-2vcpu-ubuntu-2204
     steps:
       - name: Checkout
diff --git a/test/e2e/api7/gatewayproxy.go b/test/e2e/api7/gatewayproxy.go
@@ -23,7 +23,7 @@ import (
 	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
 )
 
-var _ = Describe("Test GatewayProxy", func() {
+var _ = Describe("Test GatewayProxy", Label("apisix.apache.org", "v1alpha1", "gatewayproxy"), func() {
 	s := scaffold.NewDefaultScaffold()
 
 	var defaultGatewayClass = `
diff --git a/test/e2e/apisix/basic.go b/test/e2e/apisix/basic.go
@@ -19,7 +19,7 @@ import (
 	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
 )
 
-var _ = Describe("APISIX Standalone Basic Tests", Label("apisix", "v2", "basic"), func() {
+var _ = Describe("APISIX Standalone Basic Tests", Label("apisix.apache.org", "v2", "basic"), func() {
 	s := scaffold.NewScaffold(&scaffold.Options{
 		ControllerName: "apisix.apache.org/apisix-ingress-controller",
 	})
diff --git a/test/e2e/apisix/consumer.go b/test/e2e/apisix/consumer.go
@@ -28,7 +28,7 @@ import (
 
 type Headers map[string]string
 
-var _ = Describe("Test ApisixConsumer", Label("apisix", "v2", "apisixconsumer"), func() {
+var _ = Describe("Test ApisixConsumer", Label("apisix.apache.org", "v2", "apisixconsumer"), func() {
 	var (
 		s = scaffold.NewScaffold(&scaffold.Options{
 			ControllerName: "apisix.apache.org/apisix-ingress-controller",
diff --git a/test/e2e/apisix/globalrule.go b/test/e2e/apisix/globalrule.go
@@ -56,7 +56,7 @@ spec:
     scope: "Namespace"
 `
 
-var _ = Describe("Test GlobalRule", Label("apisix", "v2", "apisixglobalrule"), func() {
+var _ = Describe("Test GlobalRule", Label("apisix.apache.org", "v2", "apisixglobalrule"), func() {
 	s := scaffold.NewScaffold(&scaffold.Options{
 		ControllerName: "apisix.apache.org/apisix-ingress-controller",
 	})
diff --git a/test/e2e/apisix/pluginconfig.go b/test/e2e/apisix/pluginconfig.go
@@ -59,7 +59,7 @@ spec:
     scope: "Namespace"
 `
 
-var _ = Describe("Test ApisixPluginConfig", Label("apisix", "v2", "apisixpluginconfig"), func() {
+var _ = Describe("Test ApisixPluginConfig", Label("apisix.apache.org", "v2", "apisixpluginconfig"), func() {
 	var (
 		s = scaffold.NewScaffold(&scaffold.Options{
 			ControllerName: "apisix.apache.org/apisix-ingress-controller",
diff --git a/test/e2e/apisix/route.go b/test/e2e/apisix/route.go
@@ -27,7 +27,7 @@ import (
 	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
 )
 
-var _ = Describe("Test ApisixRoute", Label("apisix", "v2", "apisixroute"), func() {
+var _ = Describe("Test ApisixRoute", Label("apisix.apache.org", "v2", "apisixroute"), func() {
 	var (
 		s = scaffold.NewScaffold(&scaffold.Options{
 			ControllerName: "apisix.apache.org/apisix-ingress-controller",
diff --git a/test/e2e/apisix/tls.go b/test/e2e/apisix/tls.go
@@ -85,7 +85,7 @@ var Cert = strings.TrimSpace(framework.TestServerCert)
 
 var Key = strings.TrimSpace(framework.TestServerKey)
 
-var _ = Describe("Test ApisixTls", Label("apisix", "v2", "apisixtls"), func() {
+var _ = Describe("Test ApisixTls", Label("apisix.apache.org", "v2", "apisixtls"), func() {
 	var (
 		s = scaffold.NewScaffold(&scaffold.Options{
 			ControllerName: "apisix.apache.org/apisix-ingress-controller",
diff --git a/test/e2e/crds/backendtrafficpolicy.go b/test/e2e/crds/backendtrafficpolicy.go
@@ -22,7 +22,7 @@ import (
 	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
 )
 
-var _ = Describe("Test BackendTrafficPolicy base on HTTPRoute", Label("apisix", "v1alpha1", "backendtrafficpolicy"), func() {
+var _ = Describe("Test BackendTrafficPolicy base on HTTPRoute", Label("apisix.apache.org", "v1alpha1", "backendtrafficpolicy"), func() {
 	s := scaffold.NewDefaultScaffold()
 
 	var defaultGatewayProxy = `
@@ -156,7 +156,7 @@ spec:
 	})
 })
 
-var _ = Describe("Test BackendTrafficPolicy base on Ingress", func() {
+var _ = Describe("Test BackendTrafficPolicy base on Ingress", Label("apisix.apache.org", "v1alpha1", "backendtrafficpolicy"), func() {
 	s := scaffold.NewScaffold(&scaffold.Options{
 		ControllerName: "apisix.apache.org/apisix-ingress-controller",
 	})
diff --git a/test/e2e/crds/consumer.go b/test/e2e/crds/consumer.go
@@ -23,7 +23,7 @@ import (
 	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
 )
 
-var _ = Describe("Test Consumer", Label("apisix", "v1alpha1", "consumer"), func() {
+var _ = Describe("Test Consumer", Label("apisix.apache.org", "v1alpha1", "consumer"), func() {
 	s := scaffold.NewDefaultScaffold()
 
 	var defaultGatewayProxy = `
diff --git a/test/e2e/gatewayapi/controller.go b/test/e2e/gatewayapi/controller.go
@@ -23,7 +23,7 @@ import (
 	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
 )
 
-var _ = Describe("Check if controller cache gets synced with correct resources", Label("networking", "basic"), func() {
+var _ = Describe("Check if controller cache gets synced with correct resources", Label("networking.k8s.io", "basic"), func() {
 
 	var gatewayProxyYaml = `
 apiVersion: apisix.apache.org/v1alpha1
diff --git a/test/e2e/gatewayapi/gateway.go b/test/e2e/gatewayapi/gateway.go
@@ -37,7 +37,7 @@ func createSecret(s *scaffold.Scaffold, secretName string) {
 	assert.Nil(GinkgoT(), err, "create secret error")
 }
 
-var _ = Describe("Test Gateway", Label("networking", "gateway"), func() {
+var _ = Describe("Test Gateway", Label("networking.k8s.io", "gateway"), func() {
 	s := scaffold.NewScaffold(&scaffold.Options{
 		ControllerName: "apisix.apache.org/apisix-ingress-controller",
 	})
diff --git a/test/e2e/gatewayapi/gatewayclass.go b/test/e2e/gatewayapi/gatewayclass.go
@@ -21,7 +21,7 @@ import (
 	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
 )
 
-var _ = Describe("Test GatewayClass", Label("networking", "gatewayclass"), func() {
+var _ = Describe("Test GatewayClass", Label("networking.k8s.io", "gatewayclass"), func() {
 	s := scaffold.NewScaffold(&scaffold.Options{
 		ControllerName: "apisix.apache.org/apisix-ingress-controller",
 	})
diff --git a/test/e2e/gatewayapi/gatewayproxy.go b/test/e2e/gatewayapi/gatewayproxy.go
@@ -23,7 +23,7 @@ import (
 	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
 )
 
-var _ = Describe("Test GatewayProxy", Label("apisix", "v1alpha1", "gatewayproxy"), func() {
+var _ = Describe("Test GatewayProxy", Label("apisix.apache.org", "v1alpha1", "gatewayproxy"), func() {
 	s := scaffold.NewDefaultScaffold()
 
 	var defaultGatewayClass = `
diff --git a/test/e2e/gatewayapi/httproute.go b/test/e2e/gatewayapi/httproute.go
@@ -33,7 +33,7 @@ import (
 	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
 )
 
-var _ = Describe("Test HTTPRoute", Label("networking", "httproute"), func() {
+var _ = Describe("Test HTTPRoute", Label("networking.k8s.io", "httproute"), func() {
 	s := scaffold.NewDefaultScaffold()
 
 	var gatewayProxyYaml = `
diff --git a/test/e2e/ingress/ingress.go b/test/e2e/ingress/ingress.go
@@ -41,7 +41,7 @@ func createSecret(s *scaffold.Scaffold, secretName string) {
 	assert.Nil(GinkgoT(), err, "create secret error")
 }
 
-var _ = Describe("Test Ingress", Label("networking", "ingress"), func() {
+var _ = Describe("Test Ingress", Label("networking.k8s.io", "ingress"), func() {
 	s := scaffold.NewScaffold(&scaffold.Options{
 		ControllerName: "apisix.apache.org/apisix-ingress-controller",
 	})

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import (`
`23`	`23`	`"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"`
`24`	`24`	`)`
`25`	`25`
`26`		`-var _ = Describe("Test GatewayProxy", func() {`
	`26`	`+var _ = Describe("Test GatewayProxy", Label("apisix.apache.org", "v1alpha1", "gatewayproxy"), func() {`
`27`	`27`	`s := scaffold.NewDefaultScaffold()`
`28`	`28`
`29`	`29`	var defaultGatewayClass = `
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import (`
`19`	`19`	`"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"`
`20`	`20`	`)`
`21`	`21`
`22`		`-var _ = Describe("APISIX Standalone Basic Tests", Label("apisix", "v2", "basic"), func() {`
	`22`	`+var _ = Describe("APISIX Standalone Basic Tests", Label("apisix.apache.org", "v2", "basic"), func() {`
`23`	`23`	`s := scaffold.NewScaffold(&scaffold.Options{`
`24`	`24`	`ControllerName: "apisix.apache.org/apisix-ingress-controller",`
`25`	`25`	`})`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ spec:`
`56`	`56`	`scope: "Namespace"`
`57`	`57`	`
`58`	`58`
`59`		`-var _ = Describe("Test GlobalRule", Label("apisix", "v2", "apisixglobalrule"), func() {`
	`59`	`+var _ = Describe("Test GlobalRule", Label("apisix.apache.org", "v2", "apisixglobalrule"), func() {`
`60`	`60`	`s := scaffold.NewScaffold(&scaffold.Options{`
`61`	`61`	`ControllerName: "apisix.apache.org/apisix-ingress-controller",`
`62`	`62`	`})`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ spec:`
`59`	`59`	`scope: "Namespace"`
`60`	`60`	`
`61`	`61`
`62`		`-var _ = Describe("Test ApisixPluginConfig", Label("apisix", "v2", "apisixpluginconfig"), func() {`
	`62`	`+var _ = Describe("Test ApisixPluginConfig", Label("apisix.apache.org", "v2", "apisixpluginconfig"), func() {`
`63`	`63`	`var (`
`64`	`64`	`s = scaffold.NewScaffold(&scaffold.Options{`
`65`	`65`	`ControllerName: "apisix.apache.org/apisix-ingress-controller",`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"`
`28`	`28`	`)`
`29`	`29`
`30`		`-var _ = Describe("Test ApisixRoute", Label("apisix", "v2", "apisixroute"), func() {`
	`30`	`+var _ = Describe("Test ApisixRoute", Label("apisix.apache.org", "v2", "apisixroute"), func() {`
`31`	`31`	`var (`
`32`	`32`	`s = scaffold.NewScaffold(&scaffold.Options{`
`33`	`33`	`ControllerName: "apisix.apache.org/apisix-ingress-controller",`