fix: r

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

Author: ronething

internal/provider/adc/executor.go

@@ -33,6 +33,7 @@ import (
 
 	"github.com/api7/gopkg/pkg/log"
 	"go.uber.org/zap"
+	"k8s.io/utils/ptr"
 
 	adctypes "github.com/apache/apisix-ingress-controller/api/adc"
 	"github.com/apache/apisix-ingress-controller/internal/types"
@@ -210,12 +211,12 @@ type ADCServerTask struct {
 
 // ADCServerOpts represents the options in ADC Server task
 type ADCServerOpts struct {
-	Backend   string            `json:"backend"`
-	Server    string            `json:"server"`
-	Token     string            `json:"token"`
-	Labels    map[string]string `json:"labels,omitempty"`
-	Types     []string          `json:"types,omitempty"`
-	TlsVerify *bool             `json:"tls_verify,omitempty"`
+	Backend             string            `json:"backend"`
+	Server              string            `json:"server"`
+	Token               string            `json:"token"`
+	LabelSelector       map[string]string `json:"labelSelector,omitempty"`
+	IncludeResourceType []string          `json:"includeResourceType,omitempty"`
+	TlsSkipVerify       *bool             `json:"tlsSkipVerify,omitempty"`
 }
 
 // HTTPADCExecutor implements ADCExecutor interface using HTTP calls to ADC Server
@@ -366,12 +367,12 @@ func (e *HTTPADCExecutor) buildHTTPRequest(ctx context.Context, serverAddr, mode
 	reqBody := ADCServerRequest{
 		Task: ADCServerTask{
 			Opts: ADCServerOpts{
-				Backend:   mode,
-				Server:    serverAddr,
-				Token:     config.Token,
-				Labels:    labels,
-				Types:     types,
-				TlsVerify: &tlsVerify,
+				Backend:             mode,
+				Server:              serverAddr,
+				Token:               config.Token,
+				LabelSelector:       labels,
+				IncludeResourceType: types,
+				TlsSkipVerify:       ptr.To(!tlsVerify),
 			},
 			Config: *resources,
 		},
@@ -386,8 +387,9 @@ func (e *HTTPADCExecutor) buildHTTPRequest(ctx context.Context, serverAddr, mode
 		zap.String("url", e.serverURL+"/sync"),
 		zap.String("server", serverAddr),
 		zap.String("mode", mode),
-		zap.Any("labels", labels),
-		zap.Strings("types", types),
+		zap.Any("labelSelector", labels),
+		zap.Strings("includeResourceType", types),
+		zap.Bool("tlsSkipVerify", !tlsVerify),
 	)
 
 	// Create HTTP request

test/e2e/crds/v2/basic.go

@@ -96,7 +96,7 @@ var _ = Describe("APISIX Standalone Basic Tests", Label("apisix.apache.org", "v2
 	})
 
 	Context("IngressClass Annotations", func() {
-		It("Basic tests", func() {
+		FIt("Basic tests", func() {
 			const gatewayProxyYaml = `
 apiVersion: apisix.apache.org/v1alpha1
 kind: GatewayProxy

test/e2e/framework/manifests/ingress.yaml

@@ -435,32 +435,26 @@ spec:
         - "server"
         - "--listen"
         - "http://127.0.0.1:3000"
+        - "--listen-status"
+        - "3001"
         ports:
         - name: http
           containerPort: 3000
           protocol: TCP
+        - name: http-status
+          containerPort: 3001
+          protocol: TCP
         livenessProbe:
-          exec:
-            command:
-              - node
-              - -e
-              - >
-                const s=require('net')
-                  .connect({host:"127.0.0.1",port:3000},
-                    ()=>{s.end();process.exit(0);});
-                s.on("error",()=>process.exit(1));
+          httpGet:
+            path: /healthz/ready
+            port: 3001
           initialDelaySeconds: 10
           periodSeconds: 10
+          timeoutSeconds: 10
         readinessProbe:
-          exec:
-            command:
-              - node
-              - -e
-              - >
-                const s=require('net')
-                  .connect({host:"127.0.0.1",port:3000},
-                    ()=>{s.end();process.exit(0);});
-                s.on("error",()=>process.exit(1));
+          httpGet:
+            path: /healthz/ready
+            port: 3001
           initialDelaySeconds: 5
           periodSeconds: 5
         securityContext: