Skip to content

Commit 00e3108

Browse files
AlinsRanAlinsRan
committed
fix test
2 parents a230d56 + 054207d commit 00e3108

File tree

6 files changed

+309
-6
lines changed

6 files changed

+309
-6
lines changed

‎Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,10 @@ kind-load-dashboard-images:
200200
@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-dp-manager:$(DASHBOARD_VERSION) --name $(KIND_NAME)
201201
@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION) --name $(KIND_NAME)
202202

203+
.PHONY: kind-load-adc-image
204+
kind-load-adc-image:
205+
@kind load docker-image ghcr.io/api7/adc:dev --name $(KIND_NAME)
206+
203207
.PHONY: kind-load-ingress-image
204208
kind-load-ingress-image:
205209
@kind load docker-image $(IMG) --name $(KIND_NAME)

‎api/adc/types.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,6 @@ type StatusEvent struct {
672672
type ResponseDetails struct {
673673
Status int `json:"status"`
674674
Headers map[string]string `json:"headers"`
675-
Data ResponseData `json:"data"`
676675
}
677676

678677
type ResponseData struct {

‎internal/adc/client/client.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,11 @@ type Client struct {
4949
}
5050

5151
func New(mode string) (*Client, error) {
52+
log.Infow("using HTTP ADC Executor", zap.String("server_url", defaultHTTPADCExecutorAddr))
53+
5254
return &Client{
5355
Store: cache.NewStore(),
54-
executor: &DefaultADCExecutor{},
56+
executor: NewHTTPADCExecutor(defaultHTTPADCExecutorAddr),
5557
BackendMode: mode,
5658
ConfigManager: common.NewConfigManager[types.NamespacedNameKind, adctypes.Config](),
5759
}, nil

‎internal/adc/client/executor.go‎

Lines changed: 256 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import (
2323
"encoding/json"
2424
"errors"
2525
"fmt"
26+
"io"
27+
"net/http"
2628
"os"
2729
"os/exec"
2830
"strings"
@@ -31,11 +33,16 @@ import (
3133

3234
"github.com/api7/gopkg/pkg/log"
3335
"go.uber.org/zap"
36+
"k8s.io/utils/ptr"
3437

3538
adctypes "github.com/apache/apisix-ingress-controller/api/adc"
3639
"github.com/apache/apisix-ingress-controller/internal/types"
3740
)
3841

42+
const (
43+
defaultHTTPADCExecutorAddr = "http://127.0.0.1:3000"
44+
)
45+
3946
type ADCExecutor interface {
4047
Execute(ctx context.Context, mode string, config adctypes.Config, args []string) error
4148
}
@@ -194,3 +201,252 @@ func BuildADCExecuteArgs(filePath string, labels map[string]string, types []stri
194201
}
195202
return args
196203
}
204+
205+
// ADCServerRequest represents the request body for ADC Server /sync endpoint
206+
type ADCServerRequest struct {
207+
Task ADCServerTask `json:"task"`
208+
}
209+
210+
// ADCServerTask represents the task configuration in ADC Server request
211+
type ADCServerTask struct {
212+
Opts ADCServerOpts `json:"opts"`
213+
Config adctypes.Resources `json:"config"`
214+
}
215+
216+
// ADCServerOpts represents the options in ADC Server task
217+
type ADCServerOpts struct {
218+
Backend string `json:"backend"`
219+
Server string `json:"server"`
220+
Token string `json:"token"`
221+
LabelSelector map[string]string `json:"labelSelector,omitempty"`
222+
IncludeResourceType []string `json:"includeResourceType,omitempty"`
223+
TlsSkipVerify *bool `json:"tlsSkipVerify,omitempty"`
224+
}
225+
226+
// HTTPADCExecutor implements ADCExecutor interface using HTTP calls to ADC Server
227+
type HTTPADCExecutor struct {
228+
sync.Mutex
229+
httpClient *http.Client
230+
serverURL string
231+
}
232+
233+
// NewHTTPADCExecutor creates a new HTTPADCExecutor with the specified ADC Server URL
234+
func NewHTTPADCExecutor(serverURL string) *HTTPADCExecutor {
235+
return &HTTPADCExecutor{
236+
httpClient: &http.Client{
237+
Timeout: 30 * time.Second,
238+
},
239+
serverURL: serverURL,
240+
}
241+
}
242+
243+
// Execute implements the ADCExecutor interface using HTTP calls
244+
func (e *HTTPADCExecutor) Execute(ctx context.Context, mode string, config adctypes.Config, args []string) error {
245+
e.Lock()
246+
defer e.Unlock()
247+
248+
return e.runHTTPSync(ctx, mode, config, args)
249+
}
250+
251+
// runHTTPSync performs HTTP sync to ADC Server for each server address
252+
func (e *HTTPADCExecutor) runHTTPSync(ctx context.Context, mode string, config adctypes.Config, args []string) error {
253+
var execErrs = types.ADCExecutionError{
254+
Name: config.Name,
255+
}
256+
257+
for _, addr := range config.ServerAddrs {
258+
if err := e.runHTTPSyncForSingleServer(ctx, addr, mode, config, args); err != nil {
259+
log.Errorw("failed to run http sync for server", zap.String("server", addr), zap.Error(err))
260+
var execErr types.ADCExecutionServerAddrError
261+
if errors.As(err, &execErr) {
262+
execErrs.FailedErrors = append(execErrs.FailedErrors, execErr)
263+
} else {
264+
execErrs.FailedErrors = append(execErrs.FailedErrors, types.ADCExecutionServerAddrError{
265+
ServerAddr: addr,
266+
Err: err.Error(),
267+
})
268+
}
269+
}
270+
}
271+
if len(execErrs.FailedErrors) > 0 {
272+
return execErrs
273+
}
274+
return nil
275+
}
276+
277+
// runHTTPSyncForSingleServer performs HTTP sync to a single ADC Server
278+
func (e *HTTPADCExecutor) runHTTPSyncForSingleServer(ctx context.Context, serverAddr, mode string, config adctypes.Config, args []string) error {
279+
ctx, cancel := context.WithTimeout(ctx, 15*time.Second)
280+
defer cancel()
281+
282+
// Parse args to extract labels, types, and file path
283+
labels, types, filePath, err := e.parseArgs(args)
284+
if err != nil {
285+
return fmt.Errorf("failed to parse args: %w", err)
286+
}
287+
288+
// Load resources from file
289+
resources, err := e.loadResourcesFromFile(filePath)
290+
if err != nil {
291+
return fmt.Errorf("failed to load resources from file %s: %w", filePath, err)
292+
}
293+
294+
// Build HTTP request
295+
req, err := e.buildHTTPRequest(ctx, serverAddr, mode, config, labels, types, resources)
296+
if err != nil {
297+
return fmt.Errorf("failed to build HTTP request: %w", err)
298+
}
299+
300+
// Send HTTP request
301+
resp, err := e.httpClient.Do(req)
302+
if err != nil {
303+
return fmt.Errorf("failed to send HTTP request: %w", err)
304+
}
305+
defer func() {
306+
if closeErr := resp.Body.Close(); closeErr != nil {
307+
log.Warnw("failed to close response body", zap.Error(closeErr))
308+
}
309+
}()
310+
311+
// Handle HTTP response
312+
return e.handleHTTPResponse(resp, serverAddr)
313+
}
314+
315+
// parseArgs parses the command line arguments to extract labels, types, and file path
316+
func (e *HTTPADCExecutor) parseArgs(args []string) (map[string]string, []string, string, error) {
317+
labels := make(map[string]string)
318+
var types []string
319+
var filePath string
320+
321+
for i := 0; i < len(args); i++ {
322+
switch args[i] {
323+
case "-f":
324+
if i+1 < len(args) {
325+
filePath = args[i+1]
326+
i++
327+
}
328+
case "--label-selector":
329+
if i+1 < len(args) {
330+
labelPair := args[i+1]
331+
parts := strings.SplitN(labelPair, "=", 2)
332+
if len(parts) == 2 {
333+
labels[parts[0]] = parts[1]
334+
}
335+
i++
336+
}
337+
case "--include-resource-type":
338+
if i+1 < len(args) {
339+
types = append(types, args[i+1])
340+
i++
341+
}
342+
}
343+
}
344+
345+
if filePath == "" {
346+
return nil, nil, "", errors.New("file path not found in args")
347+
}
348+
349+
return labels, types, filePath, nil
350+
}
351+
352+
// loadResourcesFromFile loads ADC resources from the specified file
353+
func (e *HTTPADCExecutor) loadResourcesFromFile(filePath string) (*adctypes.Resources, error) {
354+
data, err := os.ReadFile(filePath)
355+
if err != nil {
356+
return nil, fmt.Errorf("failed to read file: %w", err)
357+
}
358+
359+
var resources adctypes.Resources
360+
if err := json.Unmarshal(data, &resources); err != nil {
361+
return nil, fmt.Errorf("failed to unmarshal resources: %w", err)
362+
}
363+
364+
return &resources, nil
365+
}
366+
367+
// buildHTTPRequest builds the HTTP request for ADC Server
368+
func (e *HTTPADCExecutor) buildHTTPRequest(ctx context.Context, serverAddr, mode string, config adctypes.Config, labels map[string]string, types []string, resources *adctypes.Resources) (*http.Request, error) {
369+
// Prepare request body
370+
tlsVerify := config.TlsVerify
371+
reqBody := ADCServerRequest{
372+
Task: ADCServerTask{
373+
Opts: ADCServerOpts{
374+
Backend: mode,
375+
Server: serverAddr,
376+
Token: config.Token,
377+
LabelSelector: labels,
378+
IncludeResourceType: types,
379+
TlsSkipVerify: ptr.To(!tlsVerify),
380+
},
381+
Config: *resources,
382+
},
383+
}
384+
385+
jsonData, err := json.Marshal(reqBody)
386+
if err != nil {
387+
return nil, fmt.Errorf("failed to marshal request body: %w", err)
388+
}
389+
390+
log.Debugw("sending HTTP request to ADC Server",
391+
zap.String("url", e.serverURL+"/sync"),
392+
zap.String("server", serverAddr),
393+
zap.String("mode", mode),
394+
zap.Any("labelSelector", labels),
395+
zap.Strings("includeResourceType", types),
396+
zap.Bool("tlsSkipVerify", !tlsVerify),
397+
)
398+
399+
// Create HTTP request
400+
req, err := http.NewRequestWithContext(ctx, "PUT", e.serverURL+"/sync", bytes.NewBuffer(jsonData))
401+
if err != nil {
402+
return nil, fmt.Errorf("failed to create HTTP request: %w", err)
403+
}
404+
405+
req.Header.Set("Content-Type", "application/json")
406+
return req, nil
407+
}
408+
409+
// handleHTTPResponse handles the HTTP response from ADC Server
410+
func (e *HTTPADCExecutor) handleHTTPResponse(resp *http.Response, serverAddr string) error {
411+
body, err := io.ReadAll(resp.Body)
412+
if err != nil {
413+
return fmt.Errorf("failed to read response body: %w", err)
414+
}
415+
416+
log.Debugw("received HTTP response from ADC Server",
417+
zap.String("server", serverAddr),
418+
zap.Int("status", resp.StatusCode),
419+
zap.String("response", string(body)),
420+
)
421+
422+
// not only 200, HTTP 202 is also accepted
423+
if resp.StatusCode/100 != 2 {
424+
return types.ADCExecutionServerAddrError{
425+
ServerAddr: serverAddr,
426+
Err: fmt.Sprintf("HTTP %d: %s", resp.StatusCode, string(body)),
427+
}
428+
}
429+
430+
// Parse response body
431+
var result adctypes.SyncResult
432+
if err := json.Unmarshal(body, &result); err != nil {
433+
log.Errorw("failed to unmarshal ADC Server response",
434+
zap.Error(err),
435+
zap.String("response", string(body)),
436+
)
437+
return fmt.Errorf("failed to parse ADC Server response: %w", err)
438+
}
439+
440+
// Check for sync failures
441+
if result.FailedCount > 0 && len(result.Failed) > 0 {
442+
log.Errorw("ADC Server sync failed", zap.Any("result", result))
443+
return types.ADCExecutionServerAddrError{
444+
ServerAddr: serverAddr,
445+
Err: result.Failed[0].Reason,
446+
FailedStatuses: result.Failed,
447+
}
448+
}
449+
450+
log.Debugw("ADC Server sync success", zap.Any("result", result))
451+
return nil
452+
}

‎internal/controller/label/label.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
package label
1919

2020
import (
21+
"fmt"
22+
2123
"sigs.k8s.io/controller-runtime/pkg/client"
2224

2325
"github.com/apache/apisix-ingress-controller/internal/controller/config"
@@ -31,15 +33,17 @@ const (
3133
LabelNamespace = "k8s/namespace"
3234
LabelControllerName = "k8s/controller-name"
3335
LabelManagedBy = "manager-by"
36+
LabelResourceKey = "k8s/resource-key"
3437
)
3538

36-
func GenLabel(client client.Object, args ...string) Label {
39+
func GenLabel(obj client.Object, args ...string) Label {
3740
label := make(Label)
38-
label[LabelKind] = client.GetObjectKind().GroupVersionKind().Kind
39-
label[LabelNamespace] = client.GetNamespace()
40-
label[LabelName] = client.GetName()
41+
label[LabelKind] = obj.GetObjectKind().GroupVersionKind().Kind
42+
label[LabelNamespace] = obj.GetNamespace()
43+
label[LabelName] = obj.GetName()
4144
label[LabelControllerName] = config.ControllerConfig.ControllerName
4245
label[LabelManagedBy] = "apisix-ingress-controller"
46+
label[LabelResourceKey] = fmt.Sprintf("%s/%s/%s", label[LabelKind], label[LabelNamespace], label[LabelName])
4347
for i := 0; i < len(args); i += 2 {
4448
label[args[i]] = args[i+1]
4549
}

‎test/e2e/framework/manifests/ingress.yaml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,44 @@ spec:
422422
capabilities:
423423
drop:
424424
- ALL
425+
- image: ghcr.io/api7/adc:dev
426+
env:
427+
- name: ADC_RUNNING_MODE
428+
value: ingress
429+
- name: ADC_EXPERIMENTAL_FEATURE_FLAGS
430+
value: remote-state-file,parallel-backend-request
431+
name: adc-server
432+
args:
433+
- "server"
434+
- "--listen"
435+
- "http://127.0.0.1:3000"
436+
- "--listen-status"
437+
- "3001"
438+
ports:
439+
- name: http
440+
containerPort: 3000
441+
protocol: TCP
442+
- name: http-status
443+
containerPort: 3001
444+
protocol: TCP
445+
livenessProbe:
446+
httpGet:
447+
path: /healthz/ready
448+
port: 3001
449+
initialDelaySeconds: 10
450+
periodSeconds: 10
451+
timeoutSeconds: 10
452+
readinessProbe:
453+
httpGet:
454+
path: /healthz/ready
455+
port: 3001
456+
initialDelaySeconds: 5
457+
periodSeconds: 5
458+
securityContext:
459+
allowPrivilegeEscalation: false
460+
capabilities:
461+
drop:
462+
- ALL
425463
volumes:
426464
- name: ingress-config
427465
configMap:

0 commit comments

Comments
 (0)