fix: remove duplicate logic #221
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -957,10 +957,11 @@ func ProcessGatewayProxy(r client.Client, log logr.Logger, tctx *provider.Transl | |
| } | ||
|
|
||
| if cp.Service != nil { | ||
| serviceNN := k8stypes.NamespacedName{ | ||
| Namespace: gatewayProxy.GetNamespace(), | ||
| Name: cp.Service.Name, | ||
| } | ||
| if err := addProviderEndpointsToTranslateContext(tctx, r, serviceNN); err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
@@ -1357,10 +1358,11 @@ func ProcessIngressClassParameters(tctx *provider.TranslateContext, c client.Cli | |
|
|
||
| // process control plane provider service | ||
| if cp.Service != nil { | ||
| serviceNN := k8stypes.NamespacedName{ | ||
| Namespace: gatewayProxy.GetNamespace(), | ||
| Name: cp.Service.Name, | ||
| } | ||
| if err := addProviderEndpointsToTranslateContext(tctx, c, serviceNN); err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
@@ -1419,10 +1421,6 @@ func distinctRequests(requests []reconcile.Request) []reconcile.Request { | |
| } | ||
|
|
||
| func addProviderEndpointsToTranslateContext(tctx *provider.TranslateContext, c client.Client, serviceNN k8stypes.NamespacedName) error { | ||
| log.Debugw("to process provider endpoints by provider.service", zap.Any("service", serviceNN)) | ||
| var ( | ||
| service corev1.Service | ||
|
|
@@ -1433,39 +1431,7 @@ func addProviderEndpointsToTranslateContextWithEndpointSliceSupport(tctx *provid | |
| } | ||
| tctx.Services[serviceNN] = &service | ||
|
|
||
| return collectEndpointsWithEndpointSliceSupport(tctx, c, tctx, serviceNN, true, nil) | ||
| } | ||
|
|
||
| func TypePredicate[T client.Object]() func(obj client.Object) bool { | ||
|
|
@@ -1518,3 +1484,94 @@ func watchEndpointSliceOrEndpoints(bdr *ctrl.Builder, supportsEndpointSlice bool | |
| return bdr.Watches(&corev1.Endpoints{}, handler.EnqueueRequestsFromMapFunc(endpointsMapFunc)) | ||
| } | ||
| } | ||
|
|
||
| // 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( | ||
|
||
| ctx context.Context, | ||
| c client.Client, | ||
| tctx *provider.TranslateContext, | ||
| serviceNN k8stypes.NamespacedName, | ||
| supportsEndpointSlice bool, | ||
| subsetLabels map[string]string, | ||
| ) error { | ||
| if supportsEndpointSlice { | ||
| var endpoints discoveryv1.EndpointSliceList | ||
| if err := c.List(ctx, &endpoints, | ||
| client.InNamespace(serviceNN.Namespace), | ||
| client.MatchingLabels{ | ||
| discoveryv1.LabelServiceName: serviceNN.Name, | ||
| }, | ||
| ); err != nil { | ||
| return fmt.Errorf("failed to list endpoint slices: %v", err) | ||
| } | ||
|
|
||
| if len(subsetLabels) == 0 { | ||
| tctx.EndpointSlices[serviceNN] = endpoints.Items | ||
| } else { | ||
| // Apply subset filtering | ||
| tctx.EndpointSlices[serviceNN] = filterEndpointSlicesBySubsetLabels(ctx, c, endpoints.Items, subsetLabels) | ||
| } | ||
| } else { | ||
| // Fallback to Endpoints API for Kubernetes 1.18 compatibility | ||
| var ep corev1.Endpoints | ||
| if err := c.Get(ctx, serviceNN, &ep); err != nil { | ||
| if client.IgnoreNotFound(err) != nil { | ||
| return fmt.Errorf("failed to get endpoints: %v", err) | ||
| } | ||
| // If endpoints not found, create empty EndpointSlice list | ||
| tctx.EndpointSlices[serviceNN] = []discoveryv1.EndpointSlice{} | ||
| } else { | ||
| // Convert Endpoints to EndpointSlice format for internal consistency | ||
| convertedEndpointSlices := pkgutils.ConvertEndpointsToEndpointSlice(&ep) | ||
|
|
||
| if len(subsetLabels) == 0 { | ||
| tctx.EndpointSlices[serviceNN] = convertedEndpointSlices | ||
| } else { | ||
| // Apply subset filtering to converted EndpointSlices | ||
| tctx.EndpointSlices[serviceNN] = filterEndpointSlicesBySubsetLabels(ctx, c, convertedEndpointSlices, subsetLabels) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| // filterEndpointSlicesBySubsetLabels filters EndpointSlices by subset labels | ||
| func filterEndpointSlicesBySubsetLabels(ctx context.Context, c client.Client, endpointSlices []discoveryv1.EndpointSlice, labels map[string]string) []discoveryv1.EndpointSlice { | ||
| if len(labels) == 0 { | ||
| return endpointSlices | ||
| } | ||
|
|
||
| for i := range endpointSlices { | ||
| endpointSlices[i] = filterEndpointSliceByTargetPod(ctx, c, endpointSlices[i], labels) | ||
| } | ||
|
|
||
| return utils.Filter(endpointSlices, func(v discoveryv1.EndpointSlice) bool { | ||
| return len(v.Endpoints) > 0 | ||
| }) | ||
| } | ||
|
|
||
| // 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 |
||
| return true | ||
| } | ||
|
|
||
| var ( | ||
| pod corev1.Pod | ||
| podNN = k8stypes.NamespacedName{ | ||
| Namespace: v.TargetRef.Namespace, | ||
| Name: v.TargetRef.Name, | ||
| } | ||
| ) | ||
| if err := c.Get(ctx, podNN, &pod); err != nil { | ||
| return false | ||
| } | ||
|
|
||
| return utils.IsSubsetOf(labels, pod.GetLabels()) | ||
| }) | ||
|
|
||
| return item | ||
| } | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The function signature has
tctxpassed 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.