Skip to content

Commit ebdfeb5

Browse files
authored
Merge branch 'main' into gateway-api-upgrade
2 parents 689792e + e2272df commit ebdfeb5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+2594
-24
lines changed

README.md

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
[![OSV-Scanner](https://github.com/envoyproxy/gateway/actions/workflows/osv-scanner.yml/badge.svg)](https://github.com/envoyproxy/gateway/actions/workflows/osv-scanner.yml)
88
[![Trivy](https://github.com/envoyproxy/gateway/actions/workflows/trivy.yml/badge.svg)](https://github.com/envoyproxy/gateway/actions/workflows/trivy.yml)
99

10+
![Envoy Gateway Logo](https://github.com/cncf/artwork/blob/main/projects/envoy/envoy-gateway/horizontal/color/envoy-gateway-horizontal-color.svg)
11+
1012
Envoy Gateway is an open source project for managing Envoy Proxy as a standalone or
1113
Kubernetes-based application gateway.
1214
[Gateway API](https://gateway-api.sigs.k8s.io) resources are used to dynamically provision and configure the managed Envoy Proxies.

api/v1alpha1/envoyproxy_metric_types.go

+11-2
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,20 @@ type ProxyMetrics struct {
2727
Matches []StringMatch `json:"matches,omitempty"`
2828

2929
// EnableVirtualHostStats enables envoy stat metrics for virtual hosts.
30-
EnableVirtualHostStats bool `json:"enableVirtualHostStats,omitempty"`
30+
//
31+
// +optional
32+
EnableVirtualHostStats *bool `json:"enableVirtualHostStats,omitempty"`
3133

3234
// EnablePerEndpointStats enables per endpoint envoy stats metrics.
3335
// Please use with caution.
34-
EnablePerEndpointStats bool `json:"enablePerEndpointStats,omitempty"`
36+
//
37+
// +optional
38+
EnablePerEndpointStats *bool `json:"enablePerEndpointStats,omitempty"`
39+
40+
// EnableRequestResponseSizesStats enables publishing of histograms tracking header and body sizes of requests and responses.
41+
//
42+
// +optional
43+
EnableRequestResponseSizesStats *bool `json:"enableRequestResponseSizesStats,omitempty"`
3544
}
3645

3746
// ProxyMetricSink defines the sink of metrics.

api/v1alpha1/tracing_types.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ type TracingProviderType string
2626
const (
2727
TracingProviderTypeOpenTelemetry TracingProviderType = "OpenTelemetry"
2828
TracingProviderTypeZipkin TracingProviderType = "Zipkin"
29+
TracingProviderTypeDatadog TracingProviderType = "Datadog"
2930
)
3031

3132
// TracingProvider defines the tracing provider configuration.
@@ -37,7 +38,7 @@ const (
3738
type TracingProvider struct {
3839
BackendCluster `json:",inline"`
3940
// Type defines the tracing provider type.
40-
// +kubebuilder:validation:Enum=OpenTelemetry;Zipkin
41+
// +kubebuilder:validation:Enum=OpenTelemetry;Zipkin;Datadog
4142
// +kubebuilder:default=OpenTelemetry
4243
Type TracingProviderType `json:"type"`
4344
// Host define the provider service hostname.

api/v1alpha1/zz_generated.deepcopy.go

+15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)