feat: implment BackendRefs in EnvoyProxy #3080

zirain · 2024-04-02T02:50:14Z

codecov · 2024-04-02T03:21:38Z

Codecov Report

Attention: Patch coverage is 88.23529% with 6 lines in your changes are missing coverage. Please review.

Project coverage is 66.59%. Comparing base (29946b0) to head (2b0c4e9).
Report is 29 commits behind head on main.

❗ Current head 2b0c4e9 differs from pull request most recent head f2c446e. Consider uploading reports for the commit f2c446e to get more accurate results

Files	Patch %	Lines
internal/gatewayapi/listener.go	88.00%	2 Missing and 1 partial ⚠️
internal/utils/net/backendref.go	66.66%	2 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #3080      +/-   ##
==========================================
+ Coverage   66.51%   66.59%   +0.08%     
==========================================
  Files         161      158       -3     
  Lines       22673    21996     -677     
==========================================
- Hits        15080    14648     -432     
+ Misses       6720     6503     -217     
+ Partials      873      845      -28

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

tools/make/golang.mk

zirain · 2024-04-02T06:45:44Z

api/v1alpha1/accesslogging_types.go

@@ -96,11 +96,14 @@ type FileEnvoyProxyAccessLog struct {

 // OpenTelemetryEnvoyProxyAccessLog defines the OpenTelemetry access log sink.
 //
-// +kubebuilder:validation:XValidation:message="BackendRef only support Service Kind.",rule="!has(self.backendRef) || !has(self.backendRef.kind) || self.backendRef.kind == 'Service'"
+// +kubebuilder:validation:XValidation:message="host or backendRef needs to be set",rule="has(self.host) || has(self.backendRef)"
+// +kubebuilder:validation:XValidation:message="backendRef only support Service Kind.",rule="!has(self.backendRef) || self.backendRef.kind == 'Service'"


TBH, the previous version was more rigorous, but fails on 1.28.0.
Good news, there's dafault value on kind.

arkodg · 2024-04-05T09:33:54Z

blocked on #3091

Signed-off-by: zirain <zirain2009@gmail.com>

zirain · 2024-04-10T05:43:39Z

/retest

arkodg · 2024-04-10T06:49:08Z

api/v1alpha1/shared_types.go

@@ -407,3 +408,10 @@ type KubernetesPatchSpec struct {
 	// Object contains the raw configuration for merged object
 	Value apiextensionsv1.JSON `json:"value"`
 }
+
+// BackendRef defines how an ObjectReference that is specific to BackendRef.
+type BackendRef struct {


arkodg · 2024-04-10T06:54:15Z

internal/xds/bootstrap/bootstrap.go

+			if sink.OpenTelemetry.Host != nil {
+				host, port = *sink.OpenTelemetry.Host, uint32(sink.OpenTelemetry.Port)
+			}
+			if len(sink.OpenTelemetry.BackendRefs) > 0 {


maybe a TODO here to support multiple backendRefs in the future

EG support multi sinks, I don't think that future exists.

arkodg · 2024-04-10T06:57:09Z

internal/utils/net/backendref.go

+	gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
+)
+
+func BackendHostAndPort(backendRef gwapiv1.BackendObjectReference, defaultNamespace string) (string, uint32) {


can we find a way to reuse

gateway/internal/gatewayapi/route.go

Line 1068 in c943042

func (t *Translator) processDestination(backendRefContext BackendRefContext,

instead ?

let's address this first and then fix it with follow up PR.

there is a working implementation using endpoints for the backendRef on the #3062 draft that I'd put together while waiting on APIs to be settled so I could test things out end to end while I had time to focus on it.

might be able to pull pieces of that and use them here, particularly the common bits in the controller that are required to watch the services and endpoints for backendRefs on EnvoyProxies

api/v1alpha1/envoyproxy_metric_types.go

api/v1alpha1/tracing_types.go

Signed-off-by: zirain <zirain2009@gmail.com>

zirain · 2024-04-10T12:23:46Z

/retest

guydc

LGTM

zirain · 2024-04-11T04:13:50Z

/retest

* implment BackendRef in EnvoyProxy Signed-off-by: zirain <zirain2009@gmail.com>

zirain requested a review from a team as a code owner April 2, 2024 02:50

zirain force-pushed the proxy-telemetry-backend branch from b693668 to 27fadb3 Compare April 2, 2024 03:16

zirain force-pushed the proxy-telemetry-backend branch 2 times, most recently from 7085d61 to cc9a69c Compare April 2, 2024 05:04

zirain commented Apr 2, 2024

View reviewed changes

tools/make/golang.mk Outdated Show resolved Hide resolved

zirain commented Apr 2, 2024

View reviewed changes

zirain mentioned this pull request Apr 6, 2024

run cel validation on different k8s versions #3101

Merged

zirain force-pushed the proxy-telemetry-backend branch from 2b0c4e9 to 577f8aa Compare April 8, 2024 05:24

implment BackendRef in EnvoyProxy

a4dc637

Signed-off-by: zirain <zirain2009@gmail.com>

zirain force-pushed the proxy-telemetry-backend branch from 577f8aa to a4dc637 Compare April 8, 2024 05:26

zirain added 5 commits April 8, 2024 21:11

Merge branch 'main' into proxy-telemetry-backend

49c824a

update accesslog

0414469

Signed-off-by: zirain <zirain2009@gmail.com>

ProxyMetricSink

da580af

Signed-off-by: zirain <zirain2009@gmail.com>

TracingProvider

fe0d7d1

Signed-off-by: zirain <zirain2009@gmail.com>

more test

19ca997

Signed-off-by: zirain <zirain2009@gmail.com>

zirain changed the title ~~feat: implment BackendRef in EnvoyProxy~~ feat: implment BackendRefs in EnvoyProxy Apr 10, 2024

zirain added 3 commits April 10, 2024 11:59

nit

e4e1ca6

Signed-off-by: zirain <zirain2009@gmail.com>

Merge branch 'main' into proxy-telemetry-backend

9765a32

fix e2e

01de57e

Signed-off-by: zirain <zirain2009@gmail.com>

arkodg reviewed Apr 10, 2024

View reviewed changes

arkodg mentioned this pull request Apr 10, 2024

api: gRPC Access Log Service (ALS) sink #3078

Merged

zirain mentioned this pull request Apr 10, 2024

refactor BackendHostAndPort #3161

Closed

arkodg reviewed Apr 10, 2024

View reviewed changes

api/v1alpha1/envoyproxy_metric_types.go Outdated Show resolved Hide resolved

arkodg reviewed Apr 10, 2024

View reviewed changes

api/v1alpha1/tracing_types.go Outdated Show resolved Hide resolved

omitempty

c4ce09f

Signed-off-by: zirain <zirain2009@gmail.com>

guydc modified the milestones: v1.1.0, v1.1.0-rc1 Apr 10, 2024

guydc approved these changes Apr 10, 2024

View reviewed changes

davidalger approved these changes Apr 11, 2024

View reviewed changes

arkodg approved these changes Apr 11, 2024

View reviewed changes

Merge branch 'main' into proxy-telemetry-backend

f2c446e

zirain merged commit 0cb3299 into envoyproxy:main Apr 11, 2024
20 checks passed

zirain deleted the proxy-telemetry-backend branch April 11, 2024 04:45

zhaohuabing pushed a commit to zhaohuabing/gateway that referenced this pull request Apr 11, 2024

feat: implment BackendRefs in EnvoyProxy (envoyproxy#3080)

d81834d

* implment BackendRef in EnvoyProxy Signed-off-by: zirain <zirain2009@gmail.com>

zhaohuabing pushed a commit to zhaohuabing/gateway that referenced this pull request Apr 11, 2024

feat: implment BackendRefs in EnvoyProxy (envoyproxy#3080)

adaa4c8

* implment BackendRef in EnvoyProxy Signed-off-by: zirain <zirain2009@gmail.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: implment BackendRefs in EnvoyProxy #3080

feat: implment BackendRefs in EnvoyProxy #3080

zirain commented Apr 2, 2024

codecov bot commented Apr 2, 2024 •

edited

Loading

zirain Apr 2, 2024

arkodg commented Apr 5, 2024

zirain commented Apr 10, 2024

arkodg Apr 10, 2024

arkodg Apr 10, 2024

zirain Apr 10, 2024

arkodg Apr 10, 2024

zirain Apr 10, 2024

davidalger Apr 10, 2024

zirain commented Apr 10, 2024

guydc left a comment

zirain commented Apr 11, 2024

feat: implment BackendRefs in EnvoyProxy #3080

feat: implment BackendRefs in EnvoyProxy #3080

Conversation

zirain commented Apr 2, 2024

codecov bot commented Apr 2, 2024 • edited Loading

Codecov Report

zirain Apr 2, 2024

Choose a reason for hiding this comment

arkodg commented Apr 5, 2024

zirain commented Apr 10, 2024

arkodg Apr 10, 2024

Choose a reason for hiding this comment

arkodg Apr 10, 2024

Choose a reason for hiding this comment

zirain Apr 10, 2024

Choose a reason for hiding this comment

arkodg Apr 10, 2024

Choose a reason for hiding this comment

zirain Apr 10, 2024

Choose a reason for hiding this comment

davidalger Apr 10, 2024

Choose a reason for hiding this comment

zirain commented Apr 10, 2024

guydc left a comment

Choose a reason for hiding this comment

zirain commented Apr 11, 2024

codecov bot commented Apr 2, 2024 •

edited

Loading