Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 0 additions & 130 deletions .github/workflows/conformance-test.yml

This file was deleted.

94 changes: 0 additions & 94 deletions .github/workflows/e2e-test.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ on:
- '.github/**'
jobs:
update_release_draft:
if: github.repository == 'api7/api7-ingress-controller'
if: github.repository == 'apache/apisix-ingress-controller'
runs-on: buildjet-2vcpu-ubuntu-2204
steps:
- name: Drafting release
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,3 @@ apisix-ingress-controller-conformance-report.yaml
*.mdx
.cursor/
.env

charts/api7ee3
39 changes: 1 addition & 38 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ VERSION ?= 2.0.0

IMAGE_TAG ?= dev

IMG ?= api7/api7-ingress-controller:$(IMAGE_TAG)
IMG ?= apache/apisix-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 ?= apisix-ingress-cluster
GATEAY_API_VERSION ?= v1.2.0

DASHBOARD_VERSION ?= dev
TEST_TIMEOUT ?= 45m

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

# Utilize Kind or modify the e2e tests to load the image locally, enabling compatibility with other vendors.
.PHONY: e2e-test
e2e-test:
@kind get kubeconfig --name $(KIND_NAME) > $$KUBECONFIG
DASHBOARD_VERSION=$(DASHBOARD_VERSION) go test ./test/e2e/ -test.timeout=$(TEST_TIMEOUT) -v -ginkgo.v -ginkgo.focus="$(TEST_FOCUS)"

.PHONY: download-api7ee3-chart
download-api7ee3-chart:
@helm repo add api7 https://charts.api7.ai || true
@helm repo update
@helm pull api7/api7ee3 --destination "$(shell helm env HELM_REPOSITORY_CACHE)"
@echo "Downloaded API7EE3 chart"

.PHONY: conformance-test
conformance-test:
DASHBOARD_VERSION=$(DASHBOARD_VERSION) go test -v ./test/conformance -tags=conformance -timeout 60m

.PHONY: lint
lint: sort-import golangci-lint ## Run golangci-lint linter
$(GOLANGCI_LINT) run
Expand All @@ -146,30 +128,15 @@ kind-down:

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

.PHONY: kind-load-gateway-image
kind-load-gateway-image:
@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev --name $(KIND_NAME)

.PHONY: kind-load-dashboard-images
kind-load-dashboard-images:
@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-dp-manager:$(DASHBOARD_VERSION) --name $(KIND_NAME)
@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION) --name $(KIND_NAME)

.PHONY: kind-load-ingress-image
kind-load-ingress-image:
@kind load docker-image $(IMG) --name $(KIND_NAME)

.PHONY: pull-infra-images
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 kennethreitz/httpbin:latest
@docker pull jmalloc/echo-server:latest

Expand Down Expand Up @@ -314,10 +281,6 @@ $(GOLANGCI_LINT): $(LOCALBIN)

gofmt: ## Apply go fmt
@gofmt -w -r 'interface{} -> any' .
@gofmt -w -r 'FIt -> It' test
@gofmt -w -r 'FContext -> Context' test
@gofmt -w -r 'FDescribe -> Describe' test
@gofmt -w -r 'FDescribeTable -> DescribeTable' test
@go fmt ./...
.PHONY: gofmt

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Description

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.
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.

## Document

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

```sh
make deploy #IMG=api7/api7-ingress-controller:dev
make deploy #IMG=apache/apisix-ingress-controller:dev
```

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

```sh
make build-installer # IMG=api7/api7-ingress-controller:dev
make build-installer # IMG=apache/apisix-ingress-controller:dev
```

NOTE: The makefile target mentioned above generates an 'install.yaml'
Expand Down
13 changes: 0 additions & 13 deletions api/dashboard/v1/doc.go

This file was deleted.

Loading
Loading