Skip to content

Conversation

@ronething
Copy link
Contributor

In order to adapt to both apisix-standalone and api7ee modes, use adc dump instead of apisixCli

ronething added 6 commits June 6, 2025 15:07
Signed-off-by: ashing <[email protected]>
Signed-off-by: ashing <[email protected]>
Signed-off-by: ashing <[email protected]>
Signed-off-by: ashing <[email protected]>
Signed-off-by: ashing <[email protected]>
@github-actions
Copy link
Contributor

github-actions bot commented Jun 6, 2025

conformance test report

apiVersion: gateway.networking.k8s.io/v1
date: "2025-06-09T02:53:33Z"
gatewayAPIChannel: standard
gatewayAPIVersion: v1.2.0
implementation:
  contact: null
  organization: APISIX
  project: apisix-ingress-controller
  url: https://github.com/apache/apisix-ingress-controller.git
  version: v2.0.0
kind: ConformanceReport
mode: default
profiles:
- core:
    result: partial
    skippedTests:
    - HTTPRouteHTTPSListener
    statistics:
      Failed: 0
      Passed: 32
      Skipped: 1
  name: GATEWAY-HTTP
  summary: Core tests partially succeeded with 1 test skips.

@ronething ronething requested a review from Copilot June 9, 2025 01:21
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR adapts the test framework to support both apisix-standalone and api7ee modes by replacing the use of the apisixCli with an ADC dump mechanism.

  • Removed references to the apisixCli and its associated client methods.
  • Introduced a new ADC-based dataplane resource interface and its implementation in adc.go.
  • Updated deployers, tests, manifests, Dockerfile, and workflow steps to align with the new ADC dump approach.

Reviewed Changes

Copilot reviewed 10 out of 10 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
test/e2e/scaffold/scaffold.go Removed outdated apisixCli code and used the new Deployer interface for dataplane resources.
test/e2e/scaffold/deployer.go Extended the Deployer interface with a DefaultDataplaneResource method.
test/e2e/scaffold/apisix_deployer.go Updated createAdminTunnel and integrated the admin tunnel into the ADC logic.
test/e2e/scaffold/api7_deployer.go Removed legacy client initialization and added ADC dump-based DefaultDataplaneResource.
test/e2e/scaffold/adc.go Added new ADC dump-based dataplane resource implementation.
test/e2e/ingress/ingress.go & gatewayapi/gateway.go Modified TLS assertions to use the new Certificates field.
test/e2e/framework/manifests/apisix-standalone.yaml Adjusted deployment configuration to match the new ADC requirements.
Dockerfile.dev & .github/workflows/e2e-test.yml Updated ADC_COMMIT and added steps to build/extract the ADC binary.

Signed-off-by: ashing <[email protected]>
@ronething ronething requested a review from AlinsRan June 9, 2025 02:42
@AlinsRan AlinsRan merged commit 0a97f82 into release-v2-dev Jun 9, 2025
11 checks passed
@AlinsRan AlinsRan deleted the feat/adc_dump branch June 9, 2025 05:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants