fix: r

Signed-off-by: ashing <[email protected]>

Author: ronething

api/v1alpha1/gatewayproxy_types.go

@@ -113,6 +113,10 @@ type ControlPlaneProvider struct {
 	// +kubebuilder:validation:MinItems=1
 	Endpoints []string `json:"endpoints"`
 
+	// TlsVerify specifies whether to verify the TLS certificate of the control plane
+	// +optional
+	TlsVerify *bool `json:"tlsVerify,omitempty"`
+
 	// Auth specifies the authentication configuration
 	// +kubebuilder:validation:Required
 	Auth ControlPlaneAuth `json:"auth"`

config/samples/config.yaml

@@ -1,4 +1,4 @@
-log_level: "info"                               # The log level of the API7 Ingress Controller.
+log_level: "debug"                               # The log level of the API7 Ingress Controller.
                                                 # the default value is "info".
 
 controller_name: gateway.api7.io/api7-ingress-controller  # The controller name of the API7 Ingress Controller,
@@ -12,9 +12,9 @@ ingress_status_address: [] # The status address of the ingress.
 gateway_configs:                  # The configuration of the API7 Gateway.
 - name: api7                      # The name of the Gateway in the Gateway API.
   control_plane:
-    admin_key: "${ADMIN_KEY}"     # The admin key of the control plane.
+    admin_key: "a7adm-qqEncKkktQFWrSdF8bGpDzjcRDbVFYgRXSBSPCzpVZZkc7pags-70be7645fdf94c3c8e4d656c2334bd8b"     # The admin key of the control plane.
     endpoints:         
-      - ${ENDPOINT}               # The endpoint of the control plane.                    
+      - https://172.18.0.6:7443               # The endpoint of the control plane.                    
     tls_verify: false
   addresses:                      # record the status address of the gateway-api gateway
   - "172.18.0.4"                  # The LB IP of the gateway service.

internal/controller/ingress_controller.go

@@ -461,6 +461,8 @@ func (r *IngressReconciler) processBackendService(ctx context.Context, tctx *pro
 func (r *IngressReconciler) updateStatus(ctx context.Context, ingress *networkingv1.Ingress) error {
 	var loadBalancerStatus networkingv1.IngressLoadBalancerStatus
 
+	// todo: remove using default config, use the StatusAddress And PublishService in the gateway proxy
+
 	// 1. use the IngressStatusAddress in the config
 	statusAddresses := config.GetIngressStatusAddress()
 	if len(statusAddresses) > 0 {

internal/provider/adc/adc.go

@@ -270,17 +270,22 @@ func (d *adcClient) sync(task Task) error {
 		args = append(args, "--include-resource-type", t)
 	}
 
-	// todo: use adc config
-	// for _, config := range task.configs {
-	// 	if err := d.execADC(config, args); err != nil {
-	// 		return err
-	// 	}
-	// }
-	if err := d.execADC(adcConfig{
-		ServerAddr: d.ServerAddr,
-		Token:      d.Token,
-	}, args); err != nil {
-		return err
+	if len(task.configs) > 0 {
+		log.Debugw("syncing resources with multiple configs", zap.Any("configs", task.configs))
+		for _, config := range task.configs {
+			if err := d.execADC(config, args); err != nil {
+				return err
+			}
+		}
+	} else {
+		// todo: remove using default config
+		log.Debugw("syncing resources with default config")
+		if err := d.execADC(adcConfig{
+			ServerAddr: d.ServerAddr,
+			Token:      d.Token,
+		}, args); err != nil {
+			return err
+		}
 	}
 
 	return nil

test/e2e/ingress/ingress.go

@@ -188,4 +188,88 @@ spec:
 				Status(200)
 		})
 	})
+
+	Context("IngressClass with GatewayProxy", func() {
+		gatewayProxyYaml := `
+apiVersion: gateway.apisix.io/v1alpha1
+kind: GatewayProxy
+metadata:
+  name: api7-proxy-config
+  namespace: default
+spec:
+  provider:
+    type: ControlPlane
+    controlPlane:
+      endpoints:
+      - %s
+      auth:
+        type: AdminKey
+        adminKey:
+          value: "%s"
+`
+
+		var ingressClassWithProxy = `
+apiVersion: networking.k8s.io/v1
+kind: IngressClass
+metadata:
+  name: api7-with-proxy
+  annotations:
+    ingressclass.kubernetes.io/is-default-class: "true"
+spec:
+  controller: "gateway.api7.io/api7-ingress-controller"
+  parameters:
+    apiGroup: "gateway.apisix.io"
+    kind: "GatewayProxy"
+    name: "api7-proxy-config"
+    namespace: "default"
+    scope: "Namespace"
+`
+
+		var testIngress = `
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: api7-ingress-with-proxy
+spec:
+  ingressClassName: api7-with-proxy
+  rules:
+  - host: proxy.example.com
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: httpbin-service-e2e-test
+            port:
+              number: 80
+`
+
+		It("Test IngressClass with GatewayProxy", func() {
+			By("create GatewayProxy")
+			gatewayProxy := fmt.Sprintf(gatewayProxyYaml, framework.DashboardTLSEndpoint, s.AdminKey())
+
+			By("create GatewayProxy")
+			err := s.CreateResourceFromStringWithNamespace(gatewayProxy, "default")
+			Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
+			time.Sleep(5 * time.Second)
+
+			By("create IngressClass with GatewayProxy reference")
+			err = s.CreateResourceFromStringWithNamespace(ingressClassWithProxy, "")
+			Expect(err).NotTo(HaveOccurred(), "creating IngressClass with GatewayProxy")
+			time.Sleep(5 * time.Second)
+
+			By("create Ingress with GatewayProxy IngressClass")
+			err = s.CreateResourceFromString(testIngress)
+			Expect(err).NotTo(HaveOccurred(), "creating Ingress with GatewayProxy IngressClass")
+			time.Sleep(5 * time.Second)
+
+			By("verify HTTP request")
+			s.NewAPISIXClient().
+				GET("/get").
+				WithHost("proxy.example.com").
+				Expect().
+				Status(200)
+		})
+	})
 })