fix: r

Signed-off-by: Ashing Zheng <[email protected]>

Author: ronething

Makefile

@@ -200,6 +200,10 @@ 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-adc-image
+kind-load-adc-image:
+	@kind load docker-image ghcr.io/api7/adc:dev --name $(KIND_NAME)
+
 .PHONY: kind-load-ingress-image
 kind-load-ingress-image:
 	@kind load docker-image $(IMG) --name $(KIND_NAME)

api/adc/types.go

@@ -672,7 +672,6 @@ type StatusEvent struct {
 type ResponseDetails struct {
 	Status  int               `json:"status"`
 	Headers map[string]string `json:"headers"`
-	Data    ResponseData      `json:"data"`
 }
 
 type ResponseData struct {

internal/controller/ingressclass_controller.go

@@ -26,7 +26,6 @@ import (
 	networkingv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -37,7 +36,6 @@ import (
 	"github.com/apache/apisix-ingress-controller/api/v1alpha1"
 	"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
 	"github.com/apache/apisix-ingress-controller/internal/provider"
-	"github.com/apache/apisix-ingress-controller/internal/utils"
 )
 
 // IngressClassReconciler reconciles a IngressClass object.
@@ -98,7 +96,7 @@ func (r *IngressClassReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	// Create a translate context
 	tctx := provider.NewDefaultTranslateContext(ctx)
 
-	if err := r.processInfrastructure(tctx, ingressClass); err != nil {
+	if err := ProcessIngressClassParameters(tctx, r.Client, r.Log, ingressClass, ingressClass); err != nil {
 		r.Log.Error(err, "failed to process infrastructure for ingressclass", "ingressclass", ingressClass.GetName())
 		return ctrl.Result{}, err
 	}
@@ -175,75 +173,3 @@ func (r *IngressClassReconciler) listIngressClassesForSecret(ctx context.Context
 
 	return distinctRequests(requests)
 }
-
-func (r *IngressClassReconciler) processInfrastructure(tctx *provider.TranslateContext, ingressClass *networkingv1.IngressClass) error {
-	if ingressClass.Spec.Parameters == nil {
-		return nil
-	}
-
-	if ingressClass.Spec.Parameters.APIGroup == nil ||
-		*ingressClass.Spec.Parameters.APIGroup != v1alpha1.GroupVersion.Group ||
-		ingressClass.Spec.Parameters.Kind != KindGatewayProxy {
-		return nil
-	}
-
-	namespace := ingressClass.Namespace
-	if ingressClass.Spec.Parameters.Namespace != nil {
-		namespace = *ingressClass.Spec.Parameters.Namespace
-	}
-	// Check for annotation override
-	if annotationNamespace, exists := ingressClass.Annotations[parametersNamespaceAnnotation]; exists && annotationNamespace != "" {
-		namespace = annotationNamespace
-	}
-
-	gatewayProxy := new(v1alpha1.GatewayProxy)
-	if err := r.Get(context.Background(), client.ObjectKey{
-		Namespace: namespace,
-		Name:      ingressClass.Spec.Parameters.Name,
-	}, gatewayProxy); err != nil {
-		return fmt.Errorf("failed to get gateway proxy: %w", err)
-	}
-
-	rk := utils.NamespacedNameKind(ingressClass)
-
-	tctx.GatewayProxies[rk] = *gatewayProxy
-	tctx.ResourceParentRefs[rk] = append(tctx.ResourceParentRefs[rk], rk)
-
-	// Load secrets if needed
-	if gatewayProxy.Spec.Provider != nil && gatewayProxy.Spec.Provider.ControlPlane != nil {
-		auth := gatewayProxy.Spec.Provider.ControlPlane.Auth
-		if auth.Type == v1alpha1.AuthTypeAdminKey && auth.AdminKey != nil && auth.AdminKey.ValueFrom != nil {
-			if auth.AdminKey.ValueFrom.SecretKeyRef != nil {
-				secretRef := auth.AdminKey.ValueFrom.SecretKeyRef
-				secret := &corev1.Secret{}
-				if err := r.Get(context.Background(), client.ObjectKey{
-					Namespace: namespace,
-					Name:      secretRef.Name,
-				}, secret); err != nil {
-					r.Log.Error(err, "failed to get secret for gateway proxy", "namespace", namespace, "name", secretRef.Name)
-					return err
-				}
-				tctx.Secrets[client.ObjectKey{
-					Namespace: namespace,
-					Name:      secretRef.Name,
-				}] = secret
-			}
-		}
-	}
-
-	if service := gatewayProxy.Spec.Provider.ControlPlane.Service; service != nil {
-		if err := addProviderEndpointsToTranslateContext(tctx, r.Client, types.NamespacedName{
-			Namespace: gatewayProxy.GetNamespace(),
-			Name:      service.Name,
-		}); err != nil {
-			return err
-		}
-	}
-
-	_, ok := tctx.GatewayProxies[rk]
-	if !ok {
-		return fmt.Errorf("no gateway proxy found for ingress class")
-	}
-
-	return nil
-}

internal/provider/adc/executor.go

@@ -413,7 +413,8 @@ func (e *HTTPADCExecutor) handleHTTPResponse(resp *http.Response, serverAddr str
 		zap.String("response", string(body)),
 	)
 
-	if resp.StatusCode != http.StatusOK {
+	// not only 200, HTTP 202 is also accepted
+	if resp.StatusCode/100 != 2 {
 		return types.ADCExecutionServerAddrError{
 			ServerAddr: serverAddr,
 			Err:        fmt.Sprintf("HTTP %d: %s", resp.StatusCode, string(body)),

test/e2e/framework/manifests/ingress.yaml

@@ -434,20 +434,18 @@ spec:
         args:
         - "server"
         - "--listen"
-        - "http://127.0.0.1:3000"
+        - "http://0.0.0.0:3000"
         ports:
         - name: http
           containerPort: 3000
           protocol: TCP
         livenessProbe:
-          httpGet:
-            path: /healthz
+          tcpSocket:
             port: 3000
           initialDelaySeconds: 10
           periodSeconds: 10
         readinessProbe:
-          httpGet:
-            path: /healthz
+          tcpSocket:
             port: 3000
           initialDelaySeconds: 5
           periodSeconds: 5
@@ -456,7 +454,6 @@ spec:
           capabilities:
             drop:
             - ALL
-          runAsNonRoot: true
       volumes:
       - name: ingress-config
         configMap: