feat: support attaching EnvoyProxy resource to Gateways #3532

haoqixu · 2024-06-04T07:35:27Z

What this PR does
Support attaching EnvoyProxy resource to Gateways if MergeGateways is disabled on GatewayClass.

This PR only implements the controller part and does not implement the egctl part. I would like to submit another PR for the egctl part.

Which issue(s) this PR fixes:

codecov · 2024-06-04T18:15:31Z

Codecov Report

Attention: Patch coverage is 70.76412% with 88 lines in your changes missing coverage. Please review.

Project coverage is 68.25%. Comparing base (d49337b) to head (f72618f).

Files	Patch %	Lines
internal/provider/kubernetes/controller.go	26.73%	67 Missing and 7 partials ⚠️
internal/gatewayapi/securitypolicy.go	82.85%	3 Missing and 3 partials ⚠️
internal/gatewayapi/validate.go	82.14%	5 Missing ⚠️
internal/gatewayapi/envoyextensionpolicy.go	92.00%	1 Missing and 1 partial ⚠️
internal/gatewayapi/ext_service.go	80.00%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #3532      +/-   ##
==========================================
- Coverage   68.36%   68.25%   -0.12%     
==========================================
  Files         170      170              
  Lines       20711    20760      +49     
==========================================
+ Hits        14159    14169      +10     
- Misses       5530     5570      +40     
+ Partials     1022     1021       -1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

arkodg · 2024-06-04T18:31:27Z

thanks for picking this one up @haoqixu, looking forward to reviewing it once its ready !

haoqixu · 2024-06-06T06:55:44Z

/retest

internal/provider/kubernetes/controller.go

shawnh2 · 2024-06-06T12:00:23Z

internal/provider/kubernetes/controller.go

-			classRefsEnvoyProxy(&gc, ep) {
-			return true
+	ref := gtw.Spec.Infrastructure.ParametersRef
+	if !(string(ref.Group) == egv1a1.GroupVersion.Group &&


is there anyway to wrap these up into a helper function ? just like what we did in

gateway/internal/provider/kubernetes/helpers.go

Line 190 in 85cac84

func refsEnvoyProxy(gc *gwapiv1.GatewayClass) bool {

internal/provider/kubernetes/controller.go

internal/gatewayapi/resource.go

arkodg · 2024-06-07T00:28:01Z

internal/gatewayapi/helpers_v1alpha2.go

@@ -44,43 +44,6 @@ func PortNumPtrV1Alpha2(port int) *gwapiv1a2.PortNumber {
 	return &pn
 }

-func UpgradeParentReferences(old []gwapiv1a2.ParentReference) []gwapiv1.ParentReference {


hey is this refactor related to this GH issue, if not, can we seperate it from this PR ?

hey still seeing these refactors, so unresolving this one

The updates in GetRouteParentContext and GetParentReferences is necessary. UpgradeParentReferences will do a deepcopy for the pointer fields and makes ParentReferences unable to be used as map keys.

cc @shawnh2 who had last updated this lib

Sorry for the delay. The updates in GetRouteParentContext and GetParentReferences is indeed necessary, since the ParentRef for xRoute got all upgraded to v1.

So the codes here do need a clean-up, but we can track this in a separate issue.

internal/gatewayapi/contexts.go

haoqixu · 2024-06-07T10:54:39Z

/retest

internal/gatewayapi/translator.go

internal/gatewayapi/envoyextensionpolicy.go

arkodg · 2024-06-07T19:58:43Z

internal/provider/kubernetes/controller.go

@@ -193,6 +196,19 @@ func (r *gatewayAPIReconciler) Reconcile(ctx context.Context, _ reconcile.Reques
 		gwcResources = append(gwcResources, gwcResource)
 		resourceMappings := newResourceMapping()

+		// Process the parametersRef of the accepted GatewayClass.


cc @zirain since you had moved this code below in a prev commit

Signed-off-by: haoqixu <hq.xu0o0@gmail.com>

haoqixu · 2024-06-20T06:40:45Z

@haoqixu can rebase or merge main to fix the conflict.

done

) * refactor: rename EnvoyProxy field Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * feat(controller): process gateway.infrastructure.parametersref Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * feat(translator): support attaching EnvoyProxy to Gateways Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * chore: fix lint Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * chore: update generated code Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * chore: fix test Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * test: gateway-with-infrastructure-parametersref Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * test: add more cases Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * fix: EnvoyExtensionPolicy status Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * trigger reconciliation for envoyproxies Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * chore: rename processGCParamsRef as suggested Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * chore: add comments to Resources Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * refactor: update as suggested Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * refactor: extract resources.GetEnvoyProxy Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * refactor: move attachEnvoyProxy into GatewayContext.ResetListeners Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * refactor: change ListenerContext.gateway to GatewayContext Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * refactor: move getIRKey out of inner loop Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * fix: reset *ir.ExtAuth for each gateway Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * refactor: continue early to reduce nesting Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * refactor: rename envoyProxies and ClassEnvoyProxy Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * rename json/yaml name for envoyproxy Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * fix: pass the right envoyProxy to t.IsEnvoyServiceRouting Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * test: add more cases Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * chore: regenerate Signed-off-by: haoqixu <hq.xu0o0@gmail.com> --------- Signed-off-by: haoqixu <hq.xu0o0@gmail.com> Signed-off-by: “bjlhlin” <“lihonglin1@jd.com”>

) * refactor: rename EnvoyProxy field Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * feat(controller): process gateway.infrastructure.parametersref Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * feat(translator): support attaching EnvoyProxy to Gateways Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * chore: fix lint Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * chore: update generated code Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * chore: fix test Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * test: gateway-with-infrastructure-parametersref Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * test: add more cases Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * fix: EnvoyExtensionPolicy status Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * trigger reconciliation for envoyproxies Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * chore: rename processGCParamsRef as suggested Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * chore: add comments to Resources Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * refactor: update as suggested Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * refactor: extract resources.GetEnvoyProxy Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * refactor: move attachEnvoyProxy into GatewayContext.ResetListeners Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * refactor: change ListenerContext.gateway to GatewayContext Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * refactor: move getIRKey out of inner loop Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * fix: reset *ir.ExtAuth for each gateway Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * refactor: continue early to reduce nesting Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * refactor: rename envoyProxies and ClassEnvoyProxy Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * rename json/yaml name for envoyproxy Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * fix: pass the right envoyProxy to t.IsEnvoyServiceRouting Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * test: add more cases Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * chore: regenerate Signed-off-by: haoqixu <hq.xu0o0@gmail.com> --------- Signed-off-by: haoqixu <hq.xu0o0@gmail.com> Signed-off-by: “bjlhlin” <“lihonglin1@jd.com”> Signed-off-by: bjlhlin <lihonglin1@jd.com>

) * refactor: rename EnvoyProxy field Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * feat(controller): process gateway.infrastructure.parametersref Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * feat(translator): support attaching EnvoyProxy to Gateways Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * chore: fix lint Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * chore: update generated code Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * chore: fix test Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * test: gateway-with-infrastructure-parametersref Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * test: add more cases Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * fix: EnvoyExtensionPolicy status Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * trigger reconciliation for envoyproxies Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * chore: rename processGCParamsRef as suggested Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * chore: add comments to Resources Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * refactor: update as suggested Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * refactor: extract resources.GetEnvoyProxy Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * refactor: move attachEnvoyProxy into GatewayContext.ResetListeners Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * refactor: change ListenerContext.gateway to GatewayContext Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * refactor: move getIRKey out of inner loop Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * fix: reset *ir.ExtAuth for each gateway Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * refactor: continue early to reduce nesting Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * refactor: rename envoyProxies and ClassEnvoyProxy Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * rename json/yaml name for envoyproxy Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * fix: pass the right envoyProxy to t.IsEnvoyServiceRouting Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * test: add more cases Signed-off-by: haoqixu <hq.xu0o0@gmail.com> * chore: regenerate Signed-off-by: haoqixu <hq.xu0o0@gmail.com> --------- Signed-off-by: haoqixu <hq.xu0o0@gmail.com> Signed-off-by: bjlhlin <lihonglin1@jd.com>

haoqixu force-pushed the feat-3317 branch from e4e3ed7 to 9b0088a Compare June 4, 2024 16:58

haoqixu force-pushed the feat-3317 branch 8 times, most recently from 8d735fb to 19d9764 Compare June 6, 2024 06:39

haoqixu marked this pull request as ready for review June 6, 2024 07:26

haoqixu requested a review from a team as a code owner June 6, 2024 07:26

shawnh2 reviewed Jun 6, 2024

View reviewed changes