api7 · dspo · Apr 22, 2025 · Apr 22, 2025 · Apr 22, 2025 · Apr 22, 2025
diff --git a/PROJECT b/PROJECT
@@ -13,7 +13,7 @@ resources:
     namespaced: true
   controller: true
   domain: github.com
-  group: gateway.apisix.io
+  group: apisix.apache.org
   kind: Guestbook
   path: github.com/api7/api7-ingress-controller/api/v1alpha1
   version: v1alpha1
@@ -22,15 +22,15 @@ resources:
     namespaced: true
   controller: true
   domain: github.com
-  group: gateway.apisix.io
+  group: apisix.apache.org
   kind: GatewayProxy
   path: github.com/api7/api7-ingress-controller/api/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
     namespaced: true
   domain: github.com
-  group: gateway.apisix.io
+  group: apisix.apache.org
   kind: HTTPRoutePolicy
   path: github.com/api7/api7-ingress-controller/api/v1alpha1
   version: v1alpha1

diff --git a/api/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package v1alpha1 contains API Schema definitions for the gateway.apisix.io v1alpha1 API group
+// Package v1alpha1 contains API Schema definitions for the apisix.apache.org v1alpha1 API group
 // +kubebuilder:object:generate=true
-// +groupName=gateway.apisix.io
+// +groupName=apisix.apache.org
 package v1alpha1
 
 import (
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "gateway.apisix.io", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "apisix.apache.org", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/charts/crds/gateway.apisix.io_plugingconfig.yaml b/charts/crds/gateway.apisix.io_plugingconfig.yaml
@@ -1,9 +1,9 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: pluginconfigs.gateway.apisix.io
+  name: pluginconfigs.apisix.apache.org
 spec:
-  group: gateway.apisix.io
+  group: apisix.apache.org
   names:
     kind: PluginConfig
     listKind: PluginConfigList

diff --git a/charts/templates/cluster_role.yaml b/charts/templates/cluster_role.yaml
@@ -102,7 +102,7 @@ rules:
   - get
   - update
 - apiGroups:
-  - gateway.apisix.io
+  - apisix.apache.org
   resources:
   - pluginconfigs
   - pluginsconfigs/status

diff --git a/charts/templates/configmap.yaml b/charts/templates/configmap.yaml
@@ -7,6 +7,6 @@ data:
   config.yaml: |
     log_level: "{{ .Values.logLevel | default "debug" }}"
 
-    controller_name: {{ .Values.controllerName | default "gateway.api7.io/api7-ingress-controller" }}
+    controller_name: {{ .Values.controllerName | default "apisix.apache.org/api7-ingress-controller" }}
 
     leader_election_id: "api7-ingress-controller-leader"
diff --git a/charts/values.yaml b/charts/values.yaml
@@ -2,7 +2,7 @@ nameOverride: ""
 labelsOverride: {}
 annotations: {}
 podAnnotations: {}
-controllerName: gateway.apisix.io/api7-ingress-controller
+controllerName: apisix.apache.org/api7-ingress-controller
 replicas: 1
 admin:
   key: '' # Pass the admin key generated for the ingress gateway group

diff --git a/...way.apisix.io_backendtrafficpolicies.yaml → ...ix.apache.org_backendtrafficpolicies.yaml b/...way.apisix.io_backendtrafficpolicies.yaml → ...ix.apache.org_backendtrafficpolicies.yaml
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.15.0
-  name: backendtrafficpolicies.gateway.apisix.io
+  name: backendtrafficpolicies.apisix.apache.org
 spec:
-  group: gateway.apisix.io
+  group: apisix.apache.org
   names:
     kind: BackendTrafficPolicy
     listKind: BackendTrafficPolicyList

diff --git a/...rd/bases/gateway.apisix.io_consumers.yaml → ...rd/bases/apisix.apache.org_consumers.yaml b/...rd/bases/gateway.apisix.io_consumers.yaml → ...rd/bases/apisix.apache.org_consumers.yaml
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.15.0
-  name: consumers.gateway.apisix.io
+  name: consumers.apisix.apache.org
 spec:
-  group: gateway.apisix.io
+  group: apisix.apache.org
   names:
     kind: Consumer
     listKind: ConsumerList

diff --git a/...ses/gateway.apisix.io_gatewayproxies.yaml → ...ses/apisix.apache.org_gatewayproxies.yaml b/...ses/gateway.apisix.io_gatewayproxies.yaml → ...ses/apisix.apache.org_gatewayproxies.yaml
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.15.0
-  name: gatewayproxies.gateway.apisix.io
+  name: gatewayproxies.apisix.apache.org
 spec:
-  group: gateway.apisix.io
+  group: apisix.apache.org
   names:
     kind: GatewayProxy
     listKind: GatewayProxyList

diff --git a/.../gateway.apisix.io_httproutepolicies.yaml → .../apisix.apache.org_httproutepolicies.yaml b/.../gateway.apisix.io_httproutepolicies.yaml → .../apisix.apache.org_httproutepolicies.yaml
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.15.0
-  name: httproutepolicies.gateway.apisix.io
+  name: httproutepolicies.apisix.apache.org
 spec:
-  group: gateway.apisix.io
+  group: apisix.apache.org
   names:
     kind: HTTPRoutePolicy
     listKind: HTTPRoutePolicyList

diff --git a/...ases/gateway.apisix.io_pluginconfigs.yaml → ...ases/apisix.apache.org_pluginconfigs.yaml b/...ases/gateway.apisix.io_pluginconfigs.yaml → ...ases/apisix.apache.org_pluginconfigs.yaml
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.15.0
-  name: pluginconfigs.gateway.apisix.io
+  name: pluginconfigs.apisix.apache.org
 spec:
-  group: gateway.apisix.io
+  group: apisix.apache.org
   names:
     kind: PluginConfig
     listKind: PluginConfigList

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -2,18 +2,18 @@
 # since it depends on service name and namespace that are out of this kustomize package.
 # It should be run by config/default
 resources:
-- bases/gateway.apisix.io_pluginconfigs.yaml
-- bases/gateway.apisix.io_gatewayproxies.yaml
-- bases/gateway.apisix.io_consumers.yaml
-- bases/gateway.apisix.io_backendtrafficpolicies.yaml
-- bases/gateway.apisix.io_httproutepolicies.yaml
+- bases/apisix.apache.org_pluginconfigs.yaml
+- bases/apisix.apache.org_gatewayproxies.yaml
+- bases/apisix.apache.org_consumers.yaml
+- bases/apisix.apache.org_backendtrafficpolicies.yaml
+- bases/apisix.apache.org_httproutepolicies.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
 patches:
 - path: patches/consumer_credential_oneof.yaml
   target:
     kind: CustomResourceDefinition
-    name: consumers.gateway.apisix.io
+    name: consumers.apisix.apache.org
     group: apiextensions.k8s.io
     version: v1
 

diff --git a/config/rbac/gatewayproxy_editor_role.yaml b/config/rbac/gatewayproxy_editor_role.yaml
@@ -12,7 +12,7 @@ metadata:
   name: gatewayproxy-editor-role
 rules:
 - apiGroups:
-  - gateway.apisix.io
+  - apisix.apache.org
   resources:
   - gatewayproxies
   verbs:
@@ -24,7 +24,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - gateway.apisix.io
+  - apisix.apache.org
   resources:
   - gatewayproxies/status
   verbs:

diff --git a/config/rbac/gatewayproxy_viewer_role.yaml b/config/rbac/gatewayproxy_viewer_role.yaml
@@ -12,15 +12,15 @@ metadata:
   name: gatewayproxy-viewer-role
 rules:
 - apiGroups:
-  - gateway.apisix.io
+  - apisix.apache.org
   resources:
   - gatewayproxies
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - gateway.apisix.io
+  - apisix.apache.org
   resources:
   - gatewayproxies/status
   verbs:

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -36,86 +36,86 @@ rules:
   - list
   - watch
 - apiGroups:
-  - coordination.k8s.io
-  resources:
-  - leases
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - discovery.k8s.io
-  resources:
-  - endpointslices
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - gateway.apisix.io
+  - apisix.apache.org
   resources:
   - backendtrafficpolicies
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - gateway.apisix.io
+  - apisix.apache.org
   resources:
   - backendtrafficpolicies/status
   verbs:
   - get
   - update
 - apiGroups:
-  - gateway.apisix.io
+  - apisix.apache.org
   resources:
   - consumers
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - gateway.apisix.io
+  - apisix.apache.org
   resources:
   - consumers/status
   verbs:
   - get
   - update
 - apiGroups:
-  - gateway.apisix.io
+  - apisix.apache.org
   resources:
   - gatewayproxies
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - gateway.apisix.io
+  - apisix.apache.org
   resources:
   - httproutepolicies
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - gateway.apisix.io
+  - apisix.apache.org
   resources:
   - httproutepolicies/status
   verbs:
   - get
   - update
 - apiGroups:
-  - gateway.apisix.io
+  - apisix.apache.org
   resources:
   - pluginconfigs
   verbs:
   - get
   - list
   - watch
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - discovery.k8s.io
+  resources:
+  - endpointslices
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - gateway.networking.k8s.io
   resources:

diff --git a/config/samples/config.yaml b/config/samples/config.yaml
@@ -1,9 +1,9 @@
 log_level: "info"                               # The log level of the API7 Ingress Controller.
                                                 # the default value is "info".
 
-controller_name: gateway.apisix.io/api7-ingress-controller  # The controller name of the API7 Ingress Controller,
+controller_name: apisix.apache.org/api7-ingress-controller  # The controller name of the API7 Ingress Controller,
                                                           # which is used to identify the controller in the GatewayClass.
-                                                          # The default value is "gateway.api7.io/api7-ingress-controller".
+                                                          # The default value is "apisix.apache.org/api7-ingress-controller".
 leader_election_id: "api7-ingress-controller-leader" # The leader election ID for the API7 Ingress Controller.
                                                         # The default value is "api7-ingress-controller-leader".
 leader_election:

diff --git a/config/samples/gateway.apisix.io_v1alpha1_consumer.yaml b/config/samples/gateway.apisix.io_v1alpha1_consumer.yaml
@@ -1,4 +1,4 @@
-apiVersion: gateway.apisix.io/v1alpha1
+apiVersion: apisix.apache.org/v1alpha1
 kind: Consumer
 metadata:
   name: consumer-sample

diff --git a/config/samples/gateway.apisix.io_v1alpha1_gatewayproxy.yaml b/config/samples/gateway.apisix.io_v1alpha1_gatewayproxy.yaml
@@ -1,4 +1,4 @@
-apiVersion: gateway.apisix.io/v1alpha1
+apiVersion: apisix.apache.org/v1alpha1
 kind: GatewayProxy
 metadata:
   labels:

diff --git a/config/samples/gateway.apisix.io_v1alpha1_httproutepolicy.yaml b/config/samples/gateway.apisix.io_v1alpha1_httproutepolicy.yaml
@@ -1,4 +1,4 @@
-apiVersion: gateway.apisix.io.github.com/v1alpha1
+apiVersion: apisix.apache.org/v1alpha1
 kind: HTTPRoutePolicy
 metadata:
   labels:

diff --git a/docs/configure.md b/docs/configure.md
@@ -8,9 +8,9 @@ The API7 Ingress Controller is a Kubernetes Ingress Controller that implements t
 log_level: "info"                               # The log level of the API7 Ingress Controller.
                                                 # the default value is "info".
 
-controller_name: gateway.apisix.io/api7-ingress-controller  # The controller name of the API7 Ingress Controller,
+controller_name: apisix.apache.org/api7-ingress-controller  # The controller name of the API7 Ingress Controller,
                                                           # which is used to identify the controller in the GatewayClass.
-                                                          # The default value is "gateway.api7.io/api7-ingress-controller".
+                                                          # The default value is "apisix.apache.org/api7-ingress-controller".
 
 leader_election_id: "api7-ingress-controller-leader" # The leader election ID for the API7 Ingress Controller.
                                                         # The default value is "api7-ingress-controller-leader".
@@ -26,7 +26,7 @@ kind: GatewayClass
 metadata:
   name: api7
 spec:
-  controllerName: "gateway.api7.io/api7-ingress-controller"
+  controllerName: "apisix.apache.org/api7-ingress-controller"
 ```
 
 ### Addresses

diff --git a/docs/gateway-api.md b/docs/gateway-api.md
@@ -41,7 +41,7 @@ kind: GatewayClass
 metadata:
   name: api7
 spec:
-  controllerName: "gateway.api7.io/api7-ingress-controller"
+  controllerName: "apisix.apache.org/api7-ingress-controller"
 
 ---