feat: support apisix standalone

Signed-off-by: ashing <axingfly@gmail.com>

Author: ronething

.gitignore

@@ -34,3 +34,6 @@ apisix-ingress-controller-conformance-report.yaml
 *.mdx
 .cursor/
 .env
+
+charts/api7ee3
+docs/api

Dockerfile

@@ -1,11 +1,10 @@
-ARG ENABLE_PROXY=false
 ARG BASE_IMAGE_TAG=nonroot
 
 FROM debian:bullseye-slim AS deps
 WORKDIR /workspace
 
-ARG ADC_VERSION=0.19.0
 ARG TARGETARCH
+ARG ADC_VERSION
 
 RUN apt update \
     && apt install -y wget \

Dockerfile.dev

@@ -3,15 +3,13 @@ ARG ENABLE_PROXY=false
 FROM node:22 AS node_builder
 
 ARG TARGETARCH
-ARG ADC_COMMIT=78484e87a0168e0f86d130bfae8f808d0d1a1e41
 
 WORKDIR /app
 
 RUN apt update \
     && apt install -y git \
     && git clone --branch main https://github.com/api7/adc.git \
     && cd adc \
-    && git checkout ${ADC_COMMIT} \
     && corepack enable pnpm \
     && pnpm install \
     && NODE_ENV=production npx nx build cli \
@@ -22,10 +20,13 @@ RUN apt update \
     && rm -rf /app
 
 FROM debian:bullseye-slim
+
+ARG TARGETARCH
+
 WORKDIR /app
 
 COPY --from=node_builder /bin/adc /bin/adc
-COPY ./bin/apisix-ingress-controller .
+COPY ./bin/apisix-ingress-controller_${TARGETARCH} ./apisix-ingress-controller
 COPY ./config/samples/config.yaml ./conf/config.yaml
 
 ENTRYPOINT ["/app/apisix-ingress-controller"]

Makefile

@@ -2,17 +2,18 @@
 
 VERSION ?= 2.0.0
 
-
 IMAGE_TAG ?= dev
 
 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
+ADC_VERSION ?= 0.19.0
 
-TEST_TIMEOUT ?= 45m
+TEST_TIMEOUT ?= 60m
+TEST_DIR ?= ./test/e2e/apisix/
 
 # CRD Reference Documentation
 CRD_REF_DOCS_VERSION ?= v0.1.0
@@ -104,6 +105,21 @@ 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
+	go test $(TEST_DIR) -test.timeout=$(TEST_TIMEOUT) -v -ginkgo.v -ginkgo.focus="$(TEST_FOCUS)"
+
+.PHONY: conformance-test
+conformance-test:
+	go test -v ./test/conformance -tags=conformance -timeout 60m
+
+.PHONY: conformance-test-standalone
+conformance-test-standalone:
+	@kind get kubeconfig --name $(KIND_NAME) > $$KUBECONFIG
+	go test -v ./test/conformance/apisix -tags=conformance -timeout 60m
+
 .PHONY: lint
 lint: sort-import golangci-lint ## Run golangci-lint linter
 	$(GOLANGCI_LINT) run
@@ -164,11 +180,11 @@ build-multi-arch:
 .PHONY: build-multi-arch-image
 build-multi-arch-image: build-multi-arch
     # daemon.json: "features":{"containerd-snapshotter": true}
-	@docker buildx build --load --platform linux/amd64,linux/arm64 -t $(IMG) .
+	@docker buildx build --load --platform linux/amd64,linux/arm64 --build-arg ADC_VERSION=$(ADC_VERSION) -t $(IMG) .
 
 .PHONY: build-push-multi-arch-image
 build-push-multi-arch-image: build-multi-arch
-	@docker buildx build --push --platform linux/amd64,linux/arm64 -t $(IMG) .
+	@docker buildx build --push --platform linux/amd64,linux/arm64 --build-arg ADC_VERSION=$(ADC_VERSION) -t $(IMG) .
 
 .PHONY: run
 run: manifests generate fmt vet ## Run a controller from your host.
@@ -179,7 +195,12 @@ run: manifests generate fmt vet ## Run a controller from your host.
 # More info: https://docs.docker.com/develop/develop-images/build_enhancements/
 .PHONY: docker-build
 docker-build: set-e2e-goos build ## Build docker image with the manager.
-	$(CONTAINER_TOOL) build -t ${IMG} -f Dockerfile .
+	@echo "Building with ADC_VERSION=$(ADC_VERSION)"
+	@if [ "$(strip $(ADC_VERSION))" = "dev" ]; then \
+		$(CONTAINER_TOOL) build -t ${IMG} -f Dockerfile.dev . ; \
+	else \
+		$(CONTAINER_TOOL) build --build-arg ADC_VERSION=${ADC_VERSION} -t ${IMG} -f Dockerfile . ; \
+	fi
 
 .PHONY: docker-push
 docker-push: ## Push docker image with the manager.
@@ -255,7 +276,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v5.4.2
-CONTROLLER_TOOLS_VERSION ?= v0.15.0
+CONTROLLER_TOOLS_VERSION ?= v0.17.2
 ENVTEST_VERSION ?= release-0.18
 GOLANGCI_LINT_VERSION ?= v2.1.5
 
@@ -281,6 +302,10 @@ $(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
 

PROJECT

@@ -34,4 +34,57 @@ resources:
   kind: HTTPRoutePolicy
   path: github.com/apache/apisix-ingress-controller/api/v1alpha1
   version: v1alpha1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: github.com
+  group: apisix.apache.org
+  kind: ApisixRoute
+  path: github.com/apache/apisix-ingress-controller/api/v2
+  version: v2
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: github.com
+  group: apisix.apache.org
+  kind: ApisixConsumer
+  path: github.com/apache/apisix-ingress-controller/api/v2
+  version: v2
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: github.com
+  group: apisix.apache.org
+  kind: ApisixGlobalRule
+  path: github.com/apache/apisix-ingress-controller/api/v2
+  version: v2
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: github.com
+  group: apisix.apache.org
+  kind: ApisixTls
+  path: github.com/apache/apisix-ingress-controller/api/v2
+  version: v2
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: github.com
+  group: apisix.apache.org
+  kind: ApisixUpstream
+  path: github.com/apache/apisix-ingress-controller/api/v2
+  version: v2
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: github.com
+  group: apisix.apache.org
+  kind: ApisixPluginConfig
+  path: github.com/apache/apisix-ingress-controller/api/v2
+  version: v2
 version: "3"

api/adc/types.go

@@ -103,6 +103,13 @@ func (g *GlobalRule) DeepCopy() GlobalRule {
 	return GlobalRule(copied)
 }
 
+// +k8s:deepcopy-gen=true
+type GlobalRuleItem struct {
+	Metadata `json:",inline" yaml:",inline"`
+
+	Plugins Plugins `json:"plugins" yaml:"plugins"`
+}
+
 type PluginMetadata Plugins
 
 func (p *PluginMetadata) DeepCopy() PluginMetadata {

api/adc/zz_generated.deepcopy.go

@@ -25,10 +25,13 @@ type Consumer struct {
 
 	// ConsumerSpec defines the configuration for a consumer, including consumer name,
 	// authentication credentials, and plugin settings.
-	Spec   ConsumerSpec `json:"spec,omitempty"`
-	Status Status       `json:"status,omitempty"`
+	Spec   ConsumerSpec   `json:"spec,omitempty"`
+	Status ConsumerStatus `json:"status,omitempty"`
 }
 
+type ConsumerStatus struct {
+	Status `json:",inline"`
+}
 type ConsumerSpec struct {
 	// GatewayRef specifies the gateway details.
 	GatewayRef GatewayRef `json:"gatewayRef,omitempty"`

api/v1alpha1/consumer_types.go

@@ -117,6 +117,7 @@ type ControlPlaneProvider struct {
 	// +kubebuilder:validation:MinItems=1
 	Endpoints []string `json:"endpoints"`
 
+	Service *ProviderService `json:"service,omitempty"`
 	// TlsVerify specifies whether to verify the TLS certificate of the control plane.
 	// +optional
 	TlsVerify *bool `json:"tlsVerify,omitempty"`
@@ -126,6 +127,14 @@ type ControlPlaneProvider struct {
 	Auth ControlPlaneAuth `json:"auth"`
 }
 
+type ProviderService struct {
+	Name string `json:"name"`
+
+	// +kubebuilder:validation:Minimum=1
+	// +kubebuilder:validation:Maximum=65535
+	Port int32 `json:"port,omitempty"`
+}
+
 // +kubebuilder:object:root=true
 // GatewayProxy is the Schema for the gatewayproxies API.
 type GatewayProxy struct {