Skip to content

Commit 5dad202

Browse files
authored
feat: ready for opensource (#148)
Signed-off-by: ashing <[email protected]>
1 parent ecebace commit 5dad202

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+39
-19036
lines changed

.github/workflows/conformance-test.yml

Lines changed: 0 additions & 130 deletions
This file was deleted.

.github/workflows/e2e-test.yml

Lines changed: 0 additions & 94 deletions
This file was deleted.

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727
- '.github/**'
2828
jobs:
2929
update_release_draft:
30-
if: github.repository == 'api7/api7-ingress-controller'
30+
if: github.repository == 'apache/apisix-ingress-controller'
3131
runs-on: buildjet-2vcpu-ubuntu-2204
3232
steps:
3333
- name: Drafting release

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,3 @@ apisix-ingress-controller-conformance-report.yaml
3434
*.mdx
3535
.cursor/
3636
.env
37-
38-
charts/api7ee3

Makefile

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ VERSION ?= 2.0.0
55

66
IMAGE_TAG ?= dev
77

8-
IMG ?= api7/api7-ingress-controller:$(IMAGE_TAG)
8+
IMG ?= apache/apisix-ingress-controller:$(IMAGE_TAG)
99
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
1010
ENVTEST_K8S_VERSION = 1.30.0
1111

1212
KIND_NAME ?= apisix-ingress-cluster
1313
GATEAY_API_VERSION ?= v1.2.0
1414

15-
DASHBOARD_VERSION ?= dev
1615
TEST_TIMEOUT ?= 45m
1716

1817
# CRD Reference Documentation
@@ -105,23 +104,6 @@ test: manifests generate fmt vet envtest ## Run tests.
105104
.PHONY: kind-e2e-test
106105
kind-e2e-test: kind-up build-image kind-load-images e2e-test
107106

108-
# Utilize Kind or modify the e2e tests to load the image locally, enabling compatibility with other vendors.
109-
.PHONY: e2e-test
110-
e2e-test:
111-
@kind get kubeconfig --name $(KIND_NAME) > $$KUBECONFIG
112-
DASHBOARD_VERSION=$(DASHBOARD_VERSION) go test ./test/e2e/ -test.timeout=$(TEST_TIMEOUT) -v -ginkgo.v -ginkgo.focus="$(TEST_FOCUS)"
113-
114-
.PHONY: download-api7ee3-chart
115-
download-api7ee3-chart:
116-
@helm repo add api7 https://charts.api7.ai || true
117-
@helm repo update
118-
@helm pull api7/api7ee3 --destination "$(shell helm env HELM_REPOSITORY_CACHE)"
119-
@echo "Downloaded API7EE3 chart"
120-
121-
.PHONY: conformance-test
122-
conformance-test:
123-
DASHBOARD_VERSION=$(DASHBOARD_VERSION) go test -v ./test/conformance -tags=conformance -timeout 60m
124-
125107
.PHONY: lint
126108
lint: sort-import golangci-lint ## Run golangci-lint linter
127109
$(GOLANGCI_LINT) run
@@ -146,30 +128,15 @@ kind-down:
146128

147129
.PHONY: kind-load-images
148130
kind-load-images: pull-infra-images kind-load-ingress-image
149-
@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev --name $(KIND_NAME)
150-
@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-dp-manager:$(DASHBOARD_VERSION) --name $(KIND_NAME)
151-
@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION) --name $(KIND_NAME)
152131
@kind load docker-image kennethreitz/httpbin:latest --name $(KIND_NAME)
153132
@kind load docker-image jmalloc/echo-server:latest --name $(KIND_NAME)
154133

155-
.PHONY: kind-load-gateway-image
156-
kind-load-gateway-image:
157-
@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev --name $(KIND_NAME)
158-
159-
.PHONY: kind-load-dashboard-images
160-
kind-load-dashboard-images:
161-
@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-dp-manager:$(DASHBOARD_VERSION) --name $(KIND_NAME)
162-
@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION) --name $(KIND_NAME)
163-
164134
.PHONY: kind-load-ingress-image
165135
kind-load-ingress-image:
166136
@kind load docker-image $(IMG) --name $(KIND_NAME)
167137

168138
.PHONY: pull-infra-images
169139
pull-infra-images:
170-
@docker pull hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev
171-
@docker pull hkccr.ccs.tencentyun.com/api7-dev/api7-ee-dp-manager:$(DASHBOARD_VERSION)
172-
@docker pull hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION)
173140
@docker pull kennethreitz/httpbin:latest
174141
@docker pull jmalloc/echo-server:latest
175142

@@ -314,10 +281,6 @@ $(GOLANGCI_LINT): $(LOCALBIN)
314281

315282
gofmt: ## Apply go fmt
316283
@gofmt -w -r 'interface{} -> any' .
317-
@gofmt -w -r 'FIt -> It' test
318-
@gofmt -w -r 'FContext -> Context' test
319-
@gofmt -w -r 'FDescribe -> Describe' test
320-
@gofmt -w -r 'FDescribeTable -> DescribeTable' test
321284
@go fmt ./...
322285
.PHONY: gofmt
323286

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Description
44

5-
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.
5+
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 APISIX Gateway using Gateway API resources.
66

77
## Document
88

@@ -41,7 +41,7 @@ make install
4141
**Deploy the Manager to the cluster with the image specified by `IMG`:**
4242

4343
```sh
44-
make deploy #IMG=api7/api7-ingress-controller:dev
44+
make deploy #IMG=apache/apisix-ingress-controller:dev
4545
```
4646

4747
> **NOTE**: If you encounter RBAC errors, you may need to grant yourself cluster-admin
@@ -66,7 +66,7 @@ Following are the steps to build the installer and distribute this project to us
6666
1. Build the installer for the image built and published in the registry:
6767

6868
```sh
69-
make build-installer # IMG=api7/api7-ingress-controller:dev
69+
make build-installer # IMG=apache/apisix-ingress-controller:dev
7070
```
7171

7272
NOTE: The makefile target mentioned above generates an 'install.yaml'

api/dashboard/v1/doc.go

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)