backport: apisix ingress pr #2480 #2473 #2492#206
Merged
Conversation
Signed-off-by: ashing <axingfly@gmail.com>
Signed-off-by: ashing <axingfly@gmail.com>
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR adds custom metrics support to the APISIX Ingress Controller, implementing Prometheus-style metrics for monitoring ADC sync operations, file I/O performance, and status update queue management. Additionally, it upgrades the Go version from 1.22 to 1.23 across the project.
- Implements comprehensive Prometheus metrics for ADC operations, file I/O, and status queue monitoring
- Adds metrics endpoint exposure through Kubernetes service configuration
- Integrates metrics collection throughout the ADC sync workflow and status update processes
Reviewed Changes
Copilot reviewed 18 out of 18 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| pkg/metrics/metrics.go | New metrics package defining Prometheus metrics for ADC sync, file I/O, and status operations |
| internal/provider/adc/adc.go | Integrates metrics collection into ADC sync operations with timing and error tracking |
| internal/controller/status/updater.go | Adds queue length tracking for status update operations |
| test/e2e/scaffold/scaffold.go | Adds helper method to expose metrics endpoint for testing |
| test/e2e/apisix/route.go | Implements e2e test validation for metrics endpoint functionality |
| test/e2e/framework/manifests/ingress.yaml | Configures metrics port exposure in Kubernetes service and deployment |
| test/e2e/framework/manifests/apisix.yaml | Adds control port configuration for APISIX container |
| go.mod | Upgrades Go version to 1.23 and promotes prometheus client to direct dependency |
| README.md | Updates Go version requirement documentation |
| .github/workflows/*.yml | Updates CI/CD workflows to use Go 1.23 |
Contributor
conformance test report - apisix-standalone modeapiVersion: gateway.networking.k8s.io/v1
date: "2025-07-25T08:38:56Z"
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:
failedTests:
- HTTPRouteMatchingAcrossRoutes
result: failure
skippedTests:
- HTTPRouteHTTPSListener
statistics:
Failed: 1
Passed: 31
Skipped: 1
name: GATEWAY-HTTP
summary: Core tests failed with 1 test failures. |
Contributor
conformance test report - apisix modeapiVersion: gateway.networking.k8s.io/v1
date: "2025-07-25T08:40:09Z"
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:
failedTests:
- HTTPRouteInvalidBackendRefUnknownKind
result: failure
skippedTests:
- HTTPRouteHTTPSListener
statistics:
Failed: 1
Passed: 31
Skipped: 1
name: GATEWAY-HTTP
summary: Core tests failed with 1 test failures. |
Contributor
conformance test reportapiVersion: gateway.networking.k8s.io/v1
date: "2025-07-25T08:35:56Z"
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. |
AlinsRan
approved these changes
Jul 24, 2025
* chore: differentiate the API versions for CRD testing * revert ingress.go * update test * update test Signed-off-by: ashing <axingfly@gmail.com>
Co-authored-by: AlinsRan <alinsran@apache.org>
ronething
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Type of change:
What this PR does / why we need it:
backport #2480 #2473 #2492 from apisix-ingress-controller repo.
Pre-submission checklist: