add CEL for envoy proxy telemetry and test cases

Signed-off-by: sh2 <[email protected]>

api/v1alpha1/accesslogging_types.go

@@ -35,6 +35,9 @@ const (
 // ProxyAccessLogFormat defines the format of accesslog.
 // By default accesslogs are written to standard output.
 // +union
+//
+// +kubebuilder:validation:XValidation:rule="self.type == 'Text' ? has(self.text) : !has(self.text)",message="If AccessLogFormat type is Text, text field needs to be set."
+// +kubebuilder:validation:XValidation:rule="self.type == 'JSON' ? has(self.json) : !has(self.json)",message="If AccessLogFormat type is JSON, json field needs to be set."
 type ProxyAccessLogFormat struct {
 	// Type defines the type of accesslog format.
 	// +kubebuilder:validation:Enum=Text;JSON
@@ -65,9 +68,15 @@ const (
 	ProxyAccessLogSinkTypeOpenTelemetry ProxyAccessLogSinkType = "OpenTelemetry"
 )
 
+// ProxyAccessLogSink defines the sink of accesslog.
+// +union
+//
+// +kubebuilder:validation:XValidation:rule="self.type == 'File' ? has(self.file) : !has(self.file)",message="If AccessLogSink type is File, file field needs to be set."
+// +kubebuilder:validation:XValidation:rule="self.type == 'OpenTelemetry' ? has(self.openTelemetry) : !has(self.openTelemetry)",message="If AccessLogSink type is OpenTelemetry, openTelemetry field needs to be set."
 type ProxyAccessLogSink struct {
 	// Type defines the type of accesslog sink.
 	// +kubebuilder:validation:Enum=File;OpenTelemetry
+	// +unionDiscriminator
 	Type ProxyAccessLogSinkType `json:"type,omitempty"`
 	// File defines the file accesslog sink.
 	// +optional

api/v1alpha1/envoyproxy_metric_types.go

@@ -29,14 +29,21 @@ type ProxyMetrics struct {
 	EnableVirtualHostStats bool `json:"enableVirtualHostStats,omitempty"`
 }
 
+// ProxyMetricSink defines the sink of metrics.
+// Default metrics sink is OpenTelemetry.
+// +union
+//
+// +kubebuilder:validation:XValidation:rule="self.type == 'OpenTelemetry' ? has(self.openTelemetry) : !has(self.openTelemetry)",message="If MetricSink type is OpenTelemetry, openTelemetry field needs to be set."
 type ProxyMetricSink struct {
 	// Type defines the metric sink type.
 	// EG currently only supports OpenTelemetry.
 	// +kubebuilder:validation:Enum=OpenTelemetry
 	// +kubebuilder:default=OpenTelemetry
+	// +unionDiscriminator
 	Type MetricSinkType `json:"type"`
 	// OpenTelemetry defines the configuration for OpenTelemetry sink.
 	// It's required if the sink type is OpenTelemetry.
+	// +optional
 	OpenTelemetry *ProxyOpenTelemetrySink `json:"openTelemetry,omitempty"`
 }
 

api/v1alpha1/shared_types.go

@@ -260,16 +260,16 @@ type StringMatch struct {
 type StringMatchType string
 
 const (
-	// MatchExact :the input string must match exactly the match value.
+	// StringMatchExact :the input string must match exactly the match value.
 	StringMatchExact StringMatchType = "Exact"
 
-	// MatchPrefix :the input string must start with the match value.
+	// StringMatchPrefix :the input string must start with the match value.
 	StringMatchPrefix StringMatchType = "Prefix"
 
-	// MatchSuffix :the input string must end with the match value.
+	// StringMatchSuffix :the input string must end with the match value.
 	StringMatchSuffix StringMatchType = "Suffix"
 
-	// MatchRegularExpression :The input string must match the regular expression
+	// StringMatchRegularExpression :The input string must match the regular expression
 	// specified in the match value.
 	// The regex string must adhere to the syntax documented in
 	// https://github.com/google/re2/wiki/Syntax.

api/v1alpha1/validation/envoygateway_validate.go

@@ -15,7 +15,7 @@ import (
 	"github.com/envoyproxy/gateway/api/v1alpha1"
 )
 
-// ValidateEnvoyGateway validates the provided EnvoyGateway.
+// Validate validates the provided EnvoyGateway.
 func ValidateEnvoyGateway(eg *v1alpha1.EnvoyGateway) error {
 	switch {
 	case eg == nil:

api/v1alpha1/validation/envoyproxy_validate.go

@@ -98,8 +98,7 @@ func validateService(spec *egv1a1.EnvoyProxySpec) []error {
 				errs = append(errs, fmt.Errorf("allocateLoadBalancerNodePorts can only be set for %v type", egv1a1.ServiceTypeLoadBalancer))
 			}
 		}
-		if serviceType, serviceLoadBalancerIP :=
-			spec.Provider.Kubernetes.EnvoyService.Type, spec.Provider.Kubernetes.EnvoyService.LoadBalancerIP; serviceType != nil && serviceLoadBalancerIP != nil {
+		if serviceType, serviceLoadBalancerIP := spec.Provider.Kubernetes.EnvoyService.Type, spec.Provider.Kubernetes.EnvoyService.LoadBalancerIP; serviceType != nil && serviceLoadBalancerIP != nil {
 			if *serviceType != egv1a1.ServiceTypeLoadBalancer {
 				errs = append(errs, fmt.Errorf("loadBalancerIP can only be set for %v type", egv1a1.ServiceTypeLoadBalancer))
 			}

api/v1alpha1/validation/envoyproxy_validate_test.go

@@ -276,27 +276,7 @@ func TestValidateEnvoyProxy(t *testing.T) {
 			},
 			expected: false,
 		},
-		{
-			name: "envoy service with valid loadBalancerIP but not 'LoadBalancer' type",
-			proxy: &egv1a1.EnvoyProxy{
-				ObjectMeta: metav1.ObjectMeta{
-					Namespace: "test",
-					Name:      "test",
-				},
-				Spec: egv1a1.EnvoyProxySpec{
-					Provider: &egv1a1.EnvoyProxyProvider{
-						Type: egv1a1.ProviderTypeKubernetes,
-						Kubernetes: &egv1a1.EnvoyProxyKubernetesProvider{
-							EnvoyService: &egv1a1.KubernetesServiceSpec{
-								Type:           egv1a1.GetKubernetesServiceType(egv1a1.ServiceTypeClusterIP),
-								LoadBalancerIP: ptr.To("10.11.12.13"),
-							},
-						},
-					},
-				},
-			},
-			expected: false,
-		},
+
 		{
 			name: "valid user bootstrap replace type",
 			proxy: &egv1a1.EnvoyProxy{
@@ -373,23 +353,6 @@ func TestValidateEnvoyProxy(t *testing.T) {
 			},
 			expected: false,
 		},
-		{
-			name: "should valid when accesslog is disabled",
-			proxy: &egv1a1.EnvoyProxy{
-				ObjectMeta: metav1.ObjectMeta{
-					Namespace: "test",
-					Name:      "test",
-				},
-				Spec: egv1a1.EnvoyProxySpec{
-					Telemetry: &egv1a1.ProxyTelemetry{
-						AccessLog: &egv1a1.ProxyAccessLog{
-							Disable: true,
-						},
-					},
-				},
-			},
-			expected: true,
-		},
 		{
 			name: "should invalid when accesslog enabled using Text format, but `text` field being empty",
 			proxy: &egv1a1.EnvoyProxy{
@@ -413,29 +376,6 @@ func TestValidateEnvoyProxy(t *testing.T) {
 			},
 			expected: false,
 		},
-		{
-			name: "should invalid when accesslog enabled using JSON format, but `json` field being empty",
-			proxy: &egv1a1.EnvoyProxy{
-				ObjectMeta: metav1.ObjectMeta{
-					Namespace: "test",
-					Name:      "test",
-				},
-				Spec: egv1a1.EnvoyProxySpec{
-					Telemetry: &egv1a1.ProxyTelemetry{
-						AccessLog: &egv1a1.ProxyAccessLog{
-							Settings: []egv1a1.ProxyAccessLogSetting{
-								{
-									Format: egv1a1.ProxyAccessLogFormat{
-										Type: egv1a1.ProxyAccessLogFormatTypeJSON,
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			expected: false,
-		},
 		{
 			name: "should invalid when accesslog enabled using File sink, but `file` field being empty",
 			proxy: &egv1a1.EnvoyProxy{
@@ -509,35 +449,6 @@ func TestValidateEnvoyProxy(t *testing.T) {
 			},
 			expected: true,
 		},
-		{
-			name: "should invalid when accesslog enabled using OpenTelemetry sink, but `openTelemetry` field being empty",
-			proxy: &egv1a1.EnvoyProxy{
-				ObjectMeta: metav1.ObjectMeta{
-					Namespace: "test",
-					Name:      "test",
-				},
-				Spec: egv1a1.EnvoyProxySpec{
-					Telemetry: &egv1a1.ProxyTelemetry{
-						AccessLog: &egv1a1.ProxyAccessLog{
-							Settings: []egv1a1.ProxyAccessLogSetting{
-								{
-									Format: egv1a1.ProxyAccessLogFormat{
-										Type: egv1a1.ProxyAccessLogFormatTypeText,
-										Text: pointer.String("[%START_TIME%]"),
-									},
-									Sinks: []egv1a1.ProxyAccessLogSink{
-										{
-											Type: egv1a1.ProxyAccessLogSinkTypeOpenTelemetry,
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			expected: false,
-		},
 	}
 
 	for i := range testCases {

charts/gateway-helm/crds/generated/gateway.envoyproxy.io_envoyproxies.yaml

@@ -5350,9 +5350,18 @@ spec:
                                   - JSON
                                   type: string
                               type: object
+                              x-kubernetes-validations:
+                              - message: If AccessLogFormat type is Text, text field
+                                  needs to be set.
+                                rule: 'self.type == ''Text'' ? has(self.text) : !has(self.text)'
+                              - message: If AccessLogFormat type is JSON, json field
+                                  needs to be set.
+                                rule: 'self.type == ''JSON'' ? has(self.json) : !has(self.json)'
                             sinks:
                               description: Sinks defines the sinks of accesslog.
                               items:
+                                description: ProxyAccessLogSink defines the sink of
+                                  accesslog.
                                 properties:
                                   file:
                                     description: File defines the file accesslog sink.
@@ -5397,6 +5406,15 @@ spec:
                                     - OpenTelemetry
                                     type: string
                                 type: object
+                                x-kubernetes-validations:
+                                - message: If AccessLogSink type is File, file field
+                                    needs to be set.
+                                  rule: 'self.type == ''File'' ? has(self.file) :
+                                    !has(self.file)'
+                                - message: If AccessLogSink type is OpenTelemetry,
+                                    openTelemetry field needs to be set.
+                                  rule: 'self.type == ''OpenTelemetry'' ? has(self.openTelemetry)
+                                    : !has(self.openTelemetry)'
                               minItems: 1
                               type: array
                           required:
@@ -5459,6 +5477,8 @@ spec:
                         description: Sinks defines the metric sinks where metrics
                           are sent to.
                         items:
+                          description: ProxyMetricSink defines the sink of metrics.
+                            Default metrics sink is OpenTelemetry.
                           properties:
                             openTelemetry:
                               description: OpenTelemetry defines the configuration
@@ -5489,6 +5509,11 @@ spec:
                           required:
                           - type
                           type: object
+                          x-kubernetes-validations:
+                          - message: If MetricSink type is OpenTelemetry, openTelemetry
+                              field needs to be set.
+                            rule: 'self.type == ''OpenTelemetry'' ? has(self.openTelemetry)
+                              : !has(self.openTelemetry)'
                         type: array
                     type: object
                   tracing:

site/content/en/latest/api/extension_types.md

@@ -1160,7 +1160,7 @@ _Appears in:_
 
 
 
-
+ProxyAccessLogSink defines the sink of accesslog.
 
 _Appears in:_
 - [ProxyAccessLogSetting](#proxyaccesslogsetting)
@@ -1227,7 +1227,7 @@ _Appears in:_
 
 
 
-
+ProxyMetricSink defines the sink of metrics. Default metrics sink is OpenTelemetry.
 
 _Appears in:_
 - [ProxyMetrics](#proxymetrics)