fix: remove duplicate logic #221
Merged
Conversation
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
Signed-off-by: Ashing Zheng <[email protected]>
Contributor
conformance test report - apisix-standalone modeapiVersion: gateway.networking.k8s.io/v1
date: "2025-08-04T10:16:31Z"
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
- HTTPRouteMatchingAcrossRoutes
result: failure
skippedTests:
- HTTPRouteHTTPSListener
statistics:
Failed: 2
Passed: 30
Skipped: 1
name: GATEWAY-HTTP
summary: Core tests failed with 2 test failures. |
Contributor
conformance test report - apisix modeapiVersion: gateway.networking.k8s.io/v1
date: "2025-08-04T10:09:11Z"
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
- HTTPRouteMatchingAcrossRoutes
result: failure
skippedTests:
- HTTPRouteHTTPSListener
statistics:
Failed: 2
Passed: 30
Skipped: 1
name: GATEWAY-HTTP
summary: Core tests failed with 2 test failures. |
Contributor
conformance test reportapiVersion: gateway.networking.k8s.io/v1
date: "2025-08-04T10:18:32Z"
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. |
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR refactors the codebase to remove duplicate logic for handling endpoint collection across multiple controllers. The main goal is to centralize the logic for collecting endpoints with EndpointSlice support and optional subset filtering.
- Consolidates duplicate endpoint collection logic into a single reusable function
- Extracts subset filtering logic into dedicated utility functions
- Simplifies controller code by replacing inline endpoint handling with function calls
Reviewed Changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| internal/controller/utils.go | Adds new consolidated endpoint collection functions and removes duplicate logic |
| internal/controller/ingress_controller.go | Replaces inline endpoint collection with centralized function call |
| internal/controller/httproute_controller.go | Replaces inline endpoint collection with centralized function call |
| internal/controller/gatewayproxy_controller.go | Updates function call to use new consolidated endpoint collection |
| internal/controller/apisixroute_controller.go | Replaces inline endpoint collection and removes duplicate filtering functions |
internal/controller/utils.go
Outdated
| } | ||
|
|
||
| return nil | ||
| return collectEndpointsWithEndpointSliceSupport(tctx, c, tctx, serviceNN, true, nil) |
There was a problem hiding this comment.
The function signature has tctx passed twice as both the context parameter and the TranslateContext parameter. This creates confusion and should be clarified by using proper parameter names or removing the redundancy.
| // filterEndpointSliceByTargetPod filters item.Endpoints which is not a subset of labels | ||
| func filterEndpointSliceByTargetPod(ctx context.Context, c client.Client, item discoveryv1.EndpointSlice, labels map[string]string) discoveryv1.EndpointSlice { | ||
| item.Endpoints = utils.Filter(item.Endpoints, func(v discoveryv1.Endpoint) bool { | ||
| if v.TargetRef == nil || v.TargetRef.Kind != KindPod { |
There was a problem hiding this comment.
The constant KindPod is referenced but not defined in this file. This will cause a compilation error unless it's imported or defined elsewhere.
Signed-off-by: Ashing Zheng <[email protected]>
…e_logic Signed-off-by: Ashing Zheng <[email protected]>
AlinsRan
reviewed
Aug 4, 2025
internal/controller/utils.go
Outdated
|
|
||
| // collectEndpointsWithEndpointSliceSupport collects endpoints and adds them to the translate context | ||
| // It handles both EndpointSlice (K8s 1.19+) and Endpoints (K8s 1.18) APIs with automatic fallback | ||
| func collectEndpointsWithEndpointSliceSupport( |
Contributor
There was a problem hiding this comment.
This name is too long and not clear enough.
My suggestion is:
- fetchServiceEndpoints
- resolveServiceEndpoints
- ...
AlinsRan
approved these changes
Aug 4, 2025
Signed-off-by: Ashing Zheng <[email protected]>
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:
Pre-submission checklist: