chore: replace "api7" with "apisix" (#130)

Author: dspo

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -12,7 +12,7 @@ body:
         Prior to opening the issue, please make sure that you:
 
         - Use English to communicate.
-        - Search the [open issues](https://github.com/apache/api7-ingress-controller/issues) to avoid duplicating the issue.
+        - Search the [open issues](https://github.com/apache/apisix-ingress-controller/issues) to avoid duplicating the issue.
 
   - type: textarea
     id: current-behavior
@@ -56,7 +56,7 @@ body:
       label: Environment
       description: Share your environment details. Reports without proper environment details will likely be closed.
       value: |
-        - APISIX Ingress controller version (run `api7-ingress-controller version --long`)
+        - APISIX Ingress controller version (run `apisix-ingress-controller version --long`)
         - Kubernetes cluster version (run `kubectl version`)
         - OS version if running APISIX Ingress controller in a bare-metal environment (run `uname -a`)
     validations:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -10,7 +10,7 @@ body:
         Prior to opening the issue, please make sure that you:
 
         - Use English to communicate.
-        - Search the [open issues](https://github.com/apache/api7-ingress-controller/issues) to avoid duplicating the issue.
+        - Search the [open issues](https://github.com/apache/apisix-ingress-controller/issues) to avoid duplicating the issue.
 
   - type: textarea
     id: description

.github/ISSUE_TEMPLATE/improve_docs.yml

@@ -11,7 +11,7 @@ body:
         Prior to opening the issue, please make sure that you:
 
         - Use English to communicate.
-        - Search the [open issues](https://github.com/apache/api7-ingress-controller/issues) to avoid duplicating the issue.
+        - Search the [open issues](https://github.com/apache/apisix-ingress-controller/issues) to avoid duplicating the issue.
 
   - type: textarea
     id: current-state

.github/ISSUE_TEMPLATE/performance_issue.yml

@@ -12,7 +12,7 @@ body:
         Prior to opening the issue, please make sure that you:
 
         - Use English to communicate.
-        - Search the [open issues](https://github.com/apache/api7-ingress-controller/issues) to avoid duplicating the issue.
+        - Search the [open issues](https://github.com/apache/apisix-ingress-controller/issues) to avoid duplicating the issue.
   - type: textarea
     id: issue-faced
     attributes:
@@ -46,7 +46,7 @@ body:
       label: Environment
       description: Share your environment details. Reports without proper environment details will likely be closed.
       value: |
-        - APISIX Ingress controller version (run `api7-ingress-controller version --long`)
+        - APISIX Ingress controller version (run `apisix-ingress-controller version --long`)
         - Kubernetes cluster version (run `kubectl version`)
         - OS version if running APISIX Ingress controller in a bare-metal environment (run `uname -a`)
     validations:

.github/ISSUE_TEMPLATE/request_help.yml

@@ -24,8 +24,8 @@ body:
       label: Environment
       description: Request help without environment information will be ignored or closed.
       value: |
-        - your api7-ingress-controller version (output of api7-ingress-controller version --long):
+        - your apisix-ingress-controller version (output of apisix-ingress-controller version --long):
         - your Kubernetes cluster version (output of kubectl version):
-        - if you run api7-ingress-controller in Bare-metal environment, also show your OS version (uname -a):
+        - if you run apisix-ingress-controller in Bare-metal environment, also show your OS version (uname -a):
     validations:
       required: true

.github/PULL_REQUEST_TEMPLATE

@@ -34,4 +34,4 @@ Please follow the requirements:
 - [ ] Did you explain what problem does this PR solve? Or what new features have been added?
 - [ ] Have you added corresponding test cases?
 - [ ] Have you modified the corresponding document?
-- [ ] Is this PR backward compatible? **If it is not backward compatible, please discuss on the [mailing list](https://github.com/apache/api7-ingress-controller#community) first**
+- [ ] Is this PR backward compatible? **If it is not backward compatible, please discuss on the [mailing list](https://github.com/apache/apisix-ingress-controller#community) first**

.github/workflows/conformance-test.yml

@@ -103,22 +103,22 @@ jobs:
       - name: Get Logs from api7-ingress-controller
         shell: bash
         run: |
-          export KUBECONFIG=/tmp/api7-ingress-cluster.kubeconfig
-          kubectl logs -n api7ee-conformance-test -l app=api7-ingress-controller
+          export KUBECONFIG=/tmp/apisix-ingress-cluster.kubeconfig
+          kubectl logs -n apisix-conformance-test -l app=apisix-ingress-controller
 
       - name: Upload Gateway API Conformance Report
         if: ${{ github.event_name == 'push' }}
         uses: actions/upload-artifact@v4
         with:
-          name: api7-ingress-controller-conformance-report.yaml
-          path: api7-ingress-controller-conformance-report.yaml
+          name: apisix-ingress-controller-conformance-report.yaml
+          path: apisix-ingress-controller-conformance-report.yaml
 
       - name: Format Conformance Test Report
         if: ${{ github.event_name == 'pull_request' }}
         run: |
           echo '# conformance test report' > report.md
           echo '```yaml' >> report.md
-          cat api7-ingress-controller-conformance-report.yaml >> report.md
+          cat apisix-ingress-controller-conformance-report.yaml >> report.md
           echo '```' >> report.md
 
       - name: Report Conformance Test Result to PR Comment

.gitignore

@@ -28,8 +28,8 @@ go.work
 
 dist
 .tmp
-api7-ingress-controller
-api7-ingress-controller-conformance-report.yaml
+apisix-ingress-controller
+apisix-ingress-controller-conformance-report.yaml
 
 *.mdx
 .cursor/

Dockerfile

@@ -22,8 +22,8 @@ ARG TARGETARCH
 WORKDIR /app
 
 COPY --from=deps /bin/adc /bin/adc
-COPY ./bin/api7-ingress-controller_${TARGETARCH} ./api7-ingress-controller
+COPY ./bin/apisix-ingress-controller_${TARGETARCH} ./apisix-ingress-controller
 COPY ./config/samples/config.yaml ./conf/config.yaml
 
-ENTRYPOINT ["/app/api7-ingress-controller"]
+ENTRYPOINT ["/app/apisix-ingress-controller"]
 CMD ["-c", "/app/conf/config.yaml"]

Dockerfile.dev

@@ -25,8 +25,8 @@ FROM debian:bullseye-slim
 WORKDIR /app
 
 COPY --from=node_builder /bin/adc /bin/adc
-COPY ./bin/api7-ingress-controller .
+COPY ./bin/apisix-ingress-controller .
 COPY ./config/samples/config.yaml ./conf/config.yaml
 
-ENTRYPOINT ["/app/api7-ingress-controller"]
+ENTRYPOINT ["/app/apisix-ingress-controller"]
 CMD ["-c", "/app/conf/config.yaml"]

Makefile

@@ -9,7 +9,7 @@ IMG ?= api7/api7-ingress-controller:$(IMAGE_TAG)
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.30.0
 
-KIND_NAME ?= api7-ingress-cluster
+KIND_NAME ?= apisix-ingress-cluster
 GATEAY_API_VERSION ?= v1.2.0
 
 DASHBOARD_VERSION ?= dev
@@ -84,7 +84,7 @@ help: ## Display this help.
 
 .PHONY: manifests
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
-	$(CONTROLLER_GEN) rbac:roleName=api7-ingress-manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) rbac:roleName=apisix-ingress-manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 
 .PHONY: generate
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
@@ -169,18 +169,18 @@ kind-load-ingress-image:
 pull-infra-images:
 	@docker pull hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev
 	@docker pull hkccr.ccs.tencentyun.com/api7-dev/api7-ee-dp-manager:$(DASHBOARD_VERSION) 
-	@docker pull hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION) 
+	@docker pull hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION)
 	@docker pull kennethreitz/httpbin:latest
 	@docker pull jmalloc/echo-server:latest
 
 ##@ Build
 
 .PHONY: build
 build: manifests generate fmt vet ## Build manager binary.
-	GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 go build -o bin/api7-ingress-controller_$(GOARCH) -ldflags $(GO_LDFLAGS) cmd/main.go
+	GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 go build -o bin/apisix-ingress-controller_$(GOARCH) -ldflags $(GO_LDFLAGS) cmd/main.go
 
 linux-build:
-	GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -o bin/api7-ingress-controller -ldflags $(GO_LDFLAGS) cmd/main.go
+	GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -o bin/apisix-ingress-controller -ldflags $(GO_LDFLAGS) cmd/main.go
 
 .PHONY: build-image
 build-image: docker-build
@@ -191,8 +191,8 @@ build-push-image: docker-build
 
 .PHONY: build-multi-arch
 build-multi-arch:
-	@CGO_ENABLED=0 GOARCH=amd64 go build -o bin/api7-ingress-controller_amd64 -ldflags $(GO_LDFLAGS) cmd/main.go
-	@CGO_ENABLED=0 GOARCH=arm64 go build -o bin/api7-ingress-controller_arm64 -ldflags $(GO_LDFLAGS) cmd/main.go
+	@CGO_ENABLED=0 GOARCH=amd64 go build -o bin/apisix-ingress-controller_amd64 -ldflags $(GO_LDFLAGS) cmd/main.go
+	@CGO_ENABLED=0 GOARCH=arm64 go build -o bin/apisix-ingress-controller_arm64 -ldflags $(GO_LDFLAGS) cmd/main.go
 
 .PHONY: build-multi-arch-image
 build-multi-arch-image: build-multi-arch
@@ -229,10 +229,10 @@ PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
 docker-buildx: ## Build and push docker image for the manager for cross-platform support
 	# copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile
 	sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross
-	- $(CONTAINER_TOOL) buildx create --name api7-ingress-builder
-	$(CONTAINER_TOOL) buildx use api7-ingress-builder
+	- $(CONTAINER_TOOL) buildx create --name apisix-ingress-builder
+	$(CONTAINER_TOOL) buildx use apisix-ingress-builder
 	- $(CONTAINER_TOOL) buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross .
-	- $(CONTAINER_TOOL) buildx rm api7-ingress-builder
+	- $(CONTAINER_TOOL) buildx rm apisix-ingress-builder
 	rm Dockerfile.cross
 
 .PHONY: build-installer

PROJECT

@@ -5,7 +5,7 @@
 domain: github.com
 layout:
 - go.kubebuilder.io/v4
-projectName: api7-ingress-controller
+projectName: apisix-ingress-controller
 repo: github.com/api7/api7-ingress-controller
 resources:
 - api:

README.md

@@ -1,8 +1,8 @@
-# api7-ingress-controller
+# apisix-ingress-controller
 
 ## Description
 
-The API7 Ingress Controller allows you to run the API7 Gateway as a Kubernetes Ingress to handle inbound traffic for a Kubernetes cluster. It dynamically configures and manages the API7 Gateway using Gateway API resources.
+The APISIX Ingress Controller allows you to run the APISIX Gateway as a Kubernetes Ingress to handle inbound traffic for a Kubernetes cluster. It dynamically configures and manages the API7 Gateway using Gateway API resources.
 
 ## Document
 

api/adc/types.go

@@ -415,7 +415,7 @@ func NewDefaultService() *Service {
 	return &Service{
 		Metadata: Metadata{
 			Labels: map[string]string{
-				"managed-by": "api7-ingress-controller",
+				"managed-by": "apisix-ingress-controller",
 			},
 		},
 		Plugins: make(Plugins),
@@ -440,9 +440,9 @@ func NewDefaultUpstream() *Upstream {
 func NewDefaultRoute() *Route {
 	return &Route{
 		Metadata: Metadata{
-			Desc: "Created by api7-ingress-controller, DO NOT modify it manually",
+			Desc: "Created by apisix-ingress-controller, DO NOT modify it manually",
 			Labels: map[string]string{
-				"managed-by": "api7-ingress-controller",
+				"managed-by": "apisix-ingress-controller",
 			},
 		},
 	}

api/dashboard/v1/zz_generated.deepcopy.go

@@ -1,6 +1,6 @@
 apiVersion: v2
-name: api7-ingress-controller-manager
-description: Api7 Ingress Controller for Kubernetes
+name: apisix-ingress-controller-manager
+description: APISIX Ingress Controller for Kubernetes
 icon: https://apache.org/logos/res/apisix/apisix.png
 keywords:
   - ingress
@@ -11,7 +11,7 @@ type: application
 version: 0.1.0
 appVersion: 2.0.0
 sources:
-  - https://github.com/api7/api7-ingress-controller
+  - https://github.com/apache/apisix-ingress-controller
 maintainers:
   - name: AlinsRan
   - name: Revolyssup

charts/Chart.yaml

@@ -1,15 +1,15 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "api7-ingress-controller-manager.name" -}}
+{{- define "apisix-ingress-controller-manager.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "api7-ingress-controller-manager.name.fullname" -}}
+{{- define "apisix-ingress-controller-manager.name.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -24,15 +24,15 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "api7-ingress-controller-manager.chart" -}}
+{{- define "apisix-ingress-controller-manager.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 {{/*
 Common labels
 */}}
-{{- define "api7-ingress-controller-manager.labels" -}}
-helm.sh/chart: {{ include "api7-ingress-controller-manager.chart" . }}
-{{ include "api7-ingress-controller-manager.selectorLabels" . }}
+{{- define "apisix-ingress-controller-manager.labels" -}}
+helm.sh/chart: {{ include "apisix-ingress-controller-manager.chart" . }}
+{{ include "apisix-ingress-controller-manager.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -42,11 +42,11 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "api7-ingress-controller-manager.selectorLabels" -}}
+{{- define "apisix-ingress-controller-manager.selectorLabels" -}}
 {{- if .Values.labelsOverride }}
 {{- tpl (.Values.labelsOverride | toYaml) . }}
 {{- else }}
-app.kubernetes.io/name: {{ include "api7-ingress-controller-manager.name" . }}
+app.kubernetes.io/name: {{ include "apisix-ingress-controller-manager.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 {{- end }}

charts/templates/_helpers.tpl

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ .Release.Name }}-api7-ingress-manager-role
+  name: {{ .Release.Name }}-apisix-ingress-manager-role
 rules:
 - apiGroups:
   - ""
@@ -191,7 +191,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ .Release.Name }}-api7-ingress-metrics-auth-role
+  name: {{ .Release.Name }}-apisix-ingress-metrics-auth-role
 rules:
 - apiGroups:
   - authentication.k8s.io
@@ -209,7 +209,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ .Release.Name }}-api7-ingress-metrics-reader
+  name: {{ .Release.Name }}-apisix-ingress-metrics-reader
 rules:
 - nonResourceURLs:
   - /metrics

charts/templates/cluster_role.yaml

@@ -2,12 +2,12 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    {{- include "api7-ingress-controller-manager.labels" . | nindent 4 }}
-  name: {{ .Release.Name }}-api7-ingress-manager-rolebinding
+    {{- include "apisix-ingress-controller-manager.labels" . | nindent 4 }}
+  name: {{ .Release.Name }}-apisix-ingress-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ .Release.Name }}-api7-ingress-manager-role
+  name: {{ .Release.Name }}-apisix-ingress-manager-role
 subjects:
 - kind: ServiceAccount
   name: {{ .Release.Name }}
@@ -16,11 +16,11 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ .Release.Name }}-api7-ingress-metrics-auth-rolebinding
+  name: {{ .Release.Name }}-apisix-ingress-metrics-auth-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ .Release.Name }}-api7-ingress-metrics-auth-role
+  name: {{ .Release.Name }}-apisix-ingress-metrics-auth-role
 subjects:
 - kind: ServiceAccount
   name: {{ .Release.Name }}