Skip to content

Commit

Permalink
Merge branch 'main' into gateway-api-upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
zhaohuabing authored Sep 29, 2024
2 parents 689792e + e2272df commit ebdfeb5
Show file tree
Hide file tree
Showing 41 changed files with 2,594 additions and 24 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
[![OSV-Scanner](https://github.com/envoyproxy/gateway/actions/workflows/osv-scanner.yml/badge.svg)](https://github.com/envoyproxy/gateway/actions/workflows/osv-scanner.yml)
[![Trivy](https://github.com/envoyproxy/gateway/actions/workflows/trivy.yml/badge.svg)](https://github.com/envoyproxy/gateway/actions/workflows/trivy.yml)

![Envoy Gateway Logo](https://github.com/cncf/artwork/blob/main/projects/envoy/envoy-gateway/horizontal/color/envoy-gateway-horizontal-color.svg)

Envoy Gateway is an open source project for managing Envoy Proxy as a standalone or
Kubernetes-based application gateway.
[Gateway API](https://gateway-api.sigs.k8s.io) resources are used to dynamically provision and configure the managed Envoy Proxies.
Expand Down
13 changes: 11 additions & 2 deletions api/v1alpha1/envoyproxy_metric_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,20 @@ type ProxyMetrics struct {
Matches []StringMatch `json:"matches,omitempty"`

// EnableVirtualHostStats enables envoy stat metrics for virtual hosts.
EnableVirtualHostStats bool `json:"enableVirtualHostStats,omitempty"`
//
// +optional
EnableVirtualHostStats *bool `json:"enableVirtualHostStats,omitempty"`

// EnablePerEndpointStats enables per endpoint envoy stats metrics.
// Please use with caution.
EnablePerEndpointStats bool `json:"enablePerEndpointStats,omitempty"`
//
// +optional
EnablePerEndpointStats *bool `json:"enablePerEndpointStats,omitempty"`

// EnableRequestResponseSizesStats enables publishing of histograms tracking header and body sizes of requests and responses.
//
// +optional
EnableRequestResponseSizesStats *bool `json:"enableRequestResponseSizesStats,omitempty"`
}

// ProxyMetricSink defines the sink of metrics.
Expand Down
3 changes: 2 additions & 1 deletion api/v1alpha1/tracing_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ type TracingProviderType string
const (
TracingProviderTypeOpenTelemetry TracingProviderType = "OpenTelemetry"
TracingProviderTypeZipkin TracingProviderType = "Zipkin"
TracingProviderTypeDatadog TracingProviderType = "Datadog"
)

// TracingProvider defines the tracing provider configuration.
Expand All @@ -37,7 +38,7 @@ const (
type TracingProvider struct {
BackendCluster `json:",inline"`
// Type defines the tracing provider type.
// +kubebuilder:validation:Enum=OpenTelemetry;Zipkin
// +kubebuilder:validation:Enum=OpenTelemetry;Zipkin;Datadog
// +kubebuilder:default=OpenTelemetry
Type TracingProviderType `json:"type"`
// Host define the provider service hostname.
Expand Down
15 changes: 15 additions & 0 deletions api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ebdfeb5

Please sign in to comment.