feat(standalone): support apisix-standalone for adc

Author: AlinsRan

Dockerfile.dev

@@ -3,7 +3,7 @@ ARG ENABLE_PROXY=false
 FROM node:22 AS node_builder
 
 ARG TARGETARCH
-ARG ADC_COMMIT=78484e87a0168e0f86d130bfae8f808d0d1a1e41
+ARG ADC_COMMIT=2449ca81e3c61169f8c1e59efb4c1173a766bce2
 
 WORKDIR /app
 
@@ -22,10 +22,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

@@ -185,6 +185,10 @@ linux-build:
 .PHONY: build-image
 build-image: docker-build
 
+.PHONY: build-image-with-adc-dev
+build-image-with-adc-dev:
+	$(CONTAINER_TOOL) build -t ${IMG} -f Dockerfile.dev .
+
 .PHONY: build-push-image
 build-push-image: docker-build
 	@docker push ${IMG}

api/v1alpha1/consumer_types.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/gatewayproxy_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 {

api/v1alpha1/zz_generated.deepcopy.go

@@ -119,6 +119,18 @@ spec:
                           type: string
                         minItems: 1
                         type: array
+                      service:
+                        properties:
+                          name:
+                            type: string
+                          port:
+                            format: int32
+                            maximum: 65535
+                            minimum: 1
+                            type: integer
+                        required:
+                        - name
+                        type: object
                       tlsVerify:
                         description: TlsVerify specifies whether to verify the TLS
                           certificate of the control plane.

config/crd/bases/apisix.apache.org_gatewayproxies.yaml

@@ -1,4 +1,4 @@
-log_level: "info"                               # The log level of the APISIX Ingress Controller.
+log_level: "debug"                               # The log level of the APISIX Ingress Controller.
                                                 # the default value is "info".
 
 controller_name: apisix.apache.org/apisix-ingress-controller  # The controller name of the APISIX Ingress Controller,
@@ -32,6 +32,8 @@ exec_adc_timeout: 15s                   # The timeout for the ADC to execute.
                                         # The default value is 15 seconds.
 
 provider:
+  type: "api7ee"
+
   sync_period: 0s
                                         # The period between two consecutive syncs.
                                         # The default value is 0 seconds, which means the controller will not sync.

config/samples/config.yaml

@@ -46,6 +46,7 @@ func NewDefaultConfig() *Config {
 		LeaderElection:   NewLeaderElection(),
 		ExecADCTimeout:   types.TimeDuration{Duration: 15 * time.Second},
 		ProviderConfig: ProviderConfig{
+			Type:          ProviderTypeStandalone,
 			SyncPeriod:    types.TimeDuration{Duration: 0},
 			InitSyncDelay: types.TimeDuration{Duration: 20 * time.Minute},
 		},
@@ -104,9 +105,21 @@ func (c *Config) Validate() error {
 	if c.ControllerName == "" {
 		return fmt.Errorf("controller_name is required")
 	}
+	if err := validateProviderType(c.ProviderConfig.Type); err != nil {
+		return err
+	}
 	return nil
 }
 
+func validateProviderType(providerType ProviderType) error {
+	switch providerType {
+	case ProviderTypeStandalone, ProviderTypeAPI7EE:
+		return nil
+	default:
+		return fmt.Errorf("unsupported provider type: %s", providerType)
+	}
+}
+
 func GetControllerName() string {
 	return ControllerConfig.ControllerName
 }

internal/controller/config/config.go

@@ -16,6 +16,13 @@ import (
 	"github.com/apache/apisix-ingress-controller/internal/types"
 )
 
+type ProviderType string
+
+const (
+	ProviderTypeStandalone ProviderType = "apisix-standalone"
+	ProviderTypeAPI7EE     ProviderType = "api7ee"
+)
+
 const (
 	// IngressAPISIXLeader is the default election id for the controller
 	// leader election.
@@ -68,6 +75,7 @@ type LeaderElection struct {
 }
 
 type ProviderConfig struct {
+	Type          ProviderType       `json:"type" yaml:"type"`
 	SyncPeriod    types.TimeDuration `json:"sync_period" yaml:"sync_period"`
 	InitSyncDelay types.TimeDuration `json:"init_sync_delay" yaml:"init_sync_delay"`
 }

internal/controller/config/types.go

@@ -169,13 +169,6 @@ func (r *GatewayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		}
 	}
 
-	if err := r.Provider.Update(ctx, tctx, gateway); err != nil {
-		acceptStatus = conditionStatus{
-			status: false,
-			msg:    err.Error(),
-		}
-	}
-
 	listenerStatuses, err := getListenerStatus(ctx, r.Client, gateway)
 	if err != nil {
 		r.Log.Error(err, "failed to get listener status", "gateway", req.NamespacedName)
@@ -194,21 +187,26 @@ func (r *GatewayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 
 		r.Updater.Update(status.Update{
 			NamespacedName: NamespacedName(gateway),
-			Resource:       gateway.DeepCopy(),
+			Resource:       &gatewayv1.Gateway{},
 			Mutator: status.MutatorFunc(func(obj client.Object) client.Object {
 				t, ok := obj.(*gatewayv1.Gateway)
 				if !ok {
 					err := fmt.Errorf("unsupported object type %T", obj)
 					panic(err)
 				}
-				t.Status = gateway.Status
-				return t
+				tCopy := t.DeepCopy()
+				tCopy.Status = gateway.Status
+				return tCopy
 			}),
 		})
 
 		return ctrl.Result{}, nil
 	}
 
+	if err := r.Provider.Update(ctx, tctx, gateway); err != nil {
+		return ctrl.Result{}, fmt.Errorf("failed to update gateway %s: %w", req.NamespacedName, err)
+	}
+
 	return ctrl.Result{}, nil
 }