diff --git a/.github/workflows/apisix-conformance-test.yml b/.github/workflows/apisix-conformance-test.yml index 708511924..5080c8f5e 100644 --- a/.github/workflows/apisix-conformance-test.yml +++ b/.github/workflows/apisix-conformance-test.yml @@ -105,7 +105,7 @@ jobs: - name: Format Conformance Test Report if: ${{ github.event_name == 'pull_request' }} run: | - echo '# conformance test report' > report.md + echo '# conformance test report - ${{ matrix.provider_type }} mode' > report.md echo '```yaml' >> report.md cat apisix-ingress-controller-conformance-report.yaml >> report.md echo '```' >> report.md diff --git a/.github/workflows/apisix-e2e-test.yml b/.github/workflows/apisix-e2e-test.yml index 6b7857dc1..416ffbd8e 100644 --- a/.github/workflows/apisix-e2e-test.yml +++ b/.github/workflows/apisix-e2e-test.yml @@ -40,6 +40,9 @@ jobs: provider_type: - apisix-standalone - apisix + cases_subset: + - apisix.apache.org + - networking.k8s.io fail-fast: false runs-on: buildjet-2vcpu-ubuntu-2204 steps: @@ -90,5 +93,6 @@ jobs: env: TEST_DIR: "./test/e2e/apisix/" PROVIDER_TYPE: ${{ matrix.provider_type }} + TEST_LABEL: ${{ matrix.cases_subset }} run: | make e2e-test diff --git a/Makefile b/Makefile index 3349e2107..ee1974877 100644 --- a/Makefile +++ b/Makefile @@ -111,7 +111,7 @@ kind-e2e-test: kind-up build-image kind-load-images e2e-test .PHONY: e2e-test e2e-test: @kind get kubeconfig --name $(KIND_NAME) > $$KUBECONFIG - DASHBOARD_VERSION=$(DASHBOARD_VERSION) go test $(TEST_DIR) -test.timeout=$(TEST_TIMEOUT) -v -ginkgo.v -ginkgo.focus="$(TEST_FOCUS)" + DASHBOARD_VERSION=$(DASHBOARD_VERSION) go test $(TEST_DIR) -test.timeout=$(TEST_TIMEOUT) -v -ginkgo.v -ginkgo.focus="$(TEST_FOCUS)" -ginkgo.label-filter="$(TEST_LABEL)" .PHONY: download-api7ee3-chart download-api7ee3-chart: diff --git a/config/rbac/gatewayproxy_editor_role.yaml b/config/rbac/gatewayproxy_editor_role.yaml deleted file mode 100644 index 7ea08d91a..000000000 --- a/config/rbac/gatewayproxy_editor_role.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# permissions for end users to edit gatewayproxies. -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - labels: - app.kubernetes.io/name: clusterrole - app.kubernetes.io/instance: gatewayproxy-editor-role - app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: apisix-ingress-controller - app.kubernetes.io/part-of: apisix-ingress-controller - app.kubernetes.io/managed-by: kustomize - name: gatewayproxy-editor-role -rules: -- apiGroups: - - apisix.apache.org - resources: - - gatewayproxies - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - apisix.apache.org - resources: - - gatewayproxies/status - verbs: - - get diff --git a/config/rbac/gatewayproxy_viewer_role.yaml b/config/rbac/gatewayproxy_viewer_role.yaml deleted file mode 100644 index 75ae42552..000000000 --- a/config/rbac/gatewayproxy_viewer_role.yaml +++ /dev/null @@ -1,27 +0,0 @@ -# permissions for end users to view gatewayproxies. -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - labels: - app.kubernetes.io/name: clusterrole - app.kubernetes.io/instance: gatewayproxy-viewer-role - app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: apisix-ingress-controller - app.kubernetes.io/part-of: apisix-ingress-controller - app.kubernetes.io/managed-by: kustomize - name: gatewayproxy-viewer-role -rules: -- apiGroups: - - apisix.apache.org - resources: - - gatewayproxies - verbs: - - get - - list - - watch -- apiGroups: - - apisix.apache.org - resources: - - gatewayproxies/status - verbs: - - get diff --git a/test/e2e/api7/gatewayproxy.go b/test/e2e/api7/gatewayproxy.go index 6e589d9ad..02c6bd3fa 100644 --- 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 index 7231aa3e6..9da130c91 100644 --- 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", 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 index e750da9d4..e8a86d989 100644 --- 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", 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 index ceac7038f..a6c09673d 100644 --- a/test/e2e/apisix/globalrule.go +++ b/test/e2e/apisix/globalrule.go @@ -56,7 +56,7 @@ spec: scope: "Namespace" ` -var _ = Describe("Test GlobalRule", 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 index 1dda08a68..5d7968c70 100644 --- a/test/e2e/apisix/pluginconfig.go +++ b/test/e2e/apisix/pluginconfig.go @@ -59,7 +59,7 @@ spec: scope: "Namespace" ` -var _ = Describe("Test 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 index 3e24082c7..63261a16d 100644 --- 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", 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 index 4fb950dfa..e5e8ee513 100644 --- 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", 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 index 4d81caaab..144edb311 100644 --- 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", 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 index ae060e3fb..7bba40e88 100644 --- 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", 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 index 6776e71b9..a3f657f11 100644 --- 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", 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 index 355b3d79e..9a12e9e03 100644 --- 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", 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 index 803fb0fa8..6cc94322d 100644 --- 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", 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 index 05972dbf1..3100ca2fb 100644 --- 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", 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 index 65092fd3f..d41e1d25b 100644 --- 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", 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 index 411af3647..a02793b8c 100644 --- 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", func() { +var _ = Describe("Test Ingress", Label("networking.k8s.io", "ingress"), func() { s := scaffold.NewScaffold(&scaffold.Options{ ControllerName: "apisix.apache.org/apisix-ingress-controller", })