+WAYPOINT |
+
+ Waypoint listener/route/cluster.
+
|
diff --git a/networking/v1alpha3/envoy_filter.proto b/networking/v1alpha3/envoy_filter.proto
index 3cfbf215a5..c8854eb682 100644
--- a/networking/v1alpha3/envoy_filter.proto
+++ b/networking/v1alpha3/envoy_filter.proto
@@ -512,6 +512,9 @@ message EnvoyFilter {
// Gateway listener/route/cluster.
GATEWAY = 3;
+
+ // Waypoint listener/route/cluster.
+ WAYPOINT = 4;
}
// One or more properties of the proxy to match on.
@@ -730,6 +733,51 @@ message EnvoyFilter {
string name = 4;
}
+ message WaypointMatch {
+ // The service port to match on.
+ // If not specified, matches all ports.
+ //
+ // +kubebuilder:validation:XValidation:message="port must be between 1-65535",rule="0 < self && self <= 65535
+ uint32 port_number = 1;
+
+ // Conditions specified in `RouteMatch` must be met for the patch
+ // to be applied to a route.
+ message RouteMatch {
+ // The Route objects generated by default are named as
+ // default. Route objects generated using a virtual service
+ // will carry the name used in the virtual service's HTTP
+ // routes.
+ string name = 1;
+ }
+
+ // Match a specific route.
+ RouteMatch route = 2;
+
+ // Conditions to match a specific filter within a filter chain.
+ message FilterMatch {
+ // The filter name to match on.
+ // For standard Envoy filters, [canonical filter](https://www.envoyproxy.io/docs/envoy/latest/version_history/v1.14.0#deprecated)
+ // names should be used.
+ string name = 1;
+
+ // Conditions to match a specific filter within another
+ // filter. This field is typically useful to match a HTTP filter
+ // inside the `envoy.filters.network.http_connection_manager` network filter.
+ message SubFilterMatch {
+ // The filter name to match on.
+ string name = 1;
+ }
+
+ // The next level filter within this filter to match on.
+ // Typically used for HTTP Connection Manager filters.
+ SubFilterMatch sub_filter = 2;
+ }
+ // The name of a specific filter to apply the patch to.
+ // Set this to `envoy.filters.network.http_connection_manager`
+ // to add a filter or apply a patch to the HTTP connection manager.
+ FilterMatch filter = 3;
+ }
+
// Patch specifies how the selected object should be modified.
message Patch {
// Operation denotes how the patch should be applied to the selected
@@ -832,6 +880,7 @@ message EnvoyFilter {
// One or more match conditions to be met before a patch is applied
// to the generated configuration for a given proxy.
+ // +kubebuilder:validation:XValidation:message="only support waypointMatch when context is WAYPOINT",rule="(self.context == 'WAYPOINT' && has(self.waypoint)) || (self.context != 'WAYPOINT' && !has(self.waypoint))"
message EnvoyConfigObjectMatch {
// The specific config generation context to match on. istiod
// generates envoy configuration in the context of a gateway,
@@ -848,6 +897,9 @@ message EnvoyFilter {
RouteConfigurationMatch route_configuration = 4;
// Match on envoy cluster attributes.
ClusterMatch cluster = 5;
+ // Match on waypoint attributes.
+ // Only work when patch context is WAYPOINT.
+ WaypointMatch waypoint = 6;
}
}
diff --git a/networking/v1alpha3/envoy_filter_deepcopy.gen.go b/networking/v1alpha3/envoy_filter_deepcopy.gen.go
index 1d402e3b86..efdaf895c1 100644
--- a/networking/v1alpha3/envoy_filter_deepcopy.gen.go
+++ b/networking/v1alpha3/envoy_filter_deepcopy.gen.go
@@ -215,6 +215,90 @@ func (in *EnvoyFilter_ListenerMatch_SubFilterMatch) DeepCopyInterface() interfac
return in.DeepCopy()
}
+// DeepCopyInto supports using EnvoyFilter_WaypointMatch within kubernetes types, where deepcopy-gen is used.
+func (in *EnvoyFilter_WaypointMatch) DeepCopyInto(out *EnvoyFilter_WaypointMatch) {
+ p := proto.Clone(in).(*EnvoyFilter_WaypointMatch)
+ *out = *p
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvoyFilter_WaypointMatch. Required by controller-gen.
+func (in *EnvoyFilter_WaypointMatch) DeepCopy() *EnvoyFilter_WaypointMatch {
+ if in == nil {
+ return nil
+ }
+ out := new(EnvoyFilter_WaypointMatch)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new EnvoyFilter_WaypointMatch. Required by controller-gen.
+func (in *EnvoyFilter_WaypointMatch) DeepCopyInterface() interface{} {
+ return in.DeepCopy()
+}
+
+// DeepCopyInto supports using EnvoyFilter_WaypointMatch_RouteMatch within kubernetes types, where deepcopy-gen is used.
+func (in *EnvoyFilter_WaypointMatch_RouteMatch) DeepCopyInto(out *EnvoyFilter_WaypointMatch_RouteMatch) {
+ p := proto.Clone(in).(*EnvoyFilter_WaypointMatch_RouteMatch)
+ *out = *p
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvoyFilter_WaypointMatch_RouteMatch. Required by controller-gen.
+func (in *EnvoyFilter_WaypointMatch_RouteMatch) DeepCopy() *EnvoyFilter_WaypointMatch_RouteMatch {
+ if in == nil {
+ return nil
+ }
+ out := new(EnvoyFilter_WaypointMatch_RouteMatch)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new EnvoyFilter_WaypointMatch_RouteMatch. Required by controller-gen.
+func (in *EnvoyFilter_WaypointMatch_RouteMatch) DeepCopyInterface() interface{} {
+ return in.DeepCopy()
+}
+
+// DeepCopyInto supports using EnvoyFilter_WaypointMatch_FilterMatch within kubernetes types, where deepcopy-gen is used.
+func (in *EnvoyFilter_WaypointMatch_FilterMatch) DeepCopyInto(out *EnvoyFilter_WaypointMatch_FilterMatch) {
+ p := proto.Clone(in).(*EnvoyFilter_WaypointMatch_FilterMatch)
+ *out = *p
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvoyFilter_WaypointMatch_FilterMatch. Required by controller-gen.
+func (in *EnvoyFilter_WaypointMatch_FilterMatch) DeepCopy() *EnvoyFilter_WaypointMatch_FilterMatch {
+ if in == nil {
+ return nil
+ }
+ out := new(EnvoyFilter_WaypointMatch_FilterMatch)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new EnvoyFilter_WaypointMatch_FilterMatch. Required by controller-gen.
+func (in *EnvoyFilter_WaypointMatch_FilterMatch) DeepCopyInterface() interface{} {
+ return in.DeepCopy()
+}
+
+// DeepCopyInto supports using EnvoyFilter_WaypointMatch_FilterMatch_SubFilterMatch within kubernetes types, where deepcopy-gen is used.
+func (in *EnvoyFilter_WaypointMatch_FilterMatch_SubFilterMatch) DeepCopyInto(out *EnvoyFilter_WaypointMatch_FilterMatch_SubFilterMatch) {
+ p := proto.Clone(in).(*EnvoyFilter_WaypointMatch_FilterMatch_SubFilterMatch)
+ *out = *p
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvoyFilter_WaypointMatch_FilterMatch_SubFilterMatch. Required by controller-gen.
+func (in *EnvoyFilter_WaypointMatch_FilterMatch_SubFilterMatch) DeepCopy() *EnvoyFilter_WaypointMatch_FilterMatch_SubFilterMatch {
+ if in == nil {
+ return nil
+ }
+ out := new(EnvoyFilter_WaypointMatch_FilterMatch_SubFilterMatch)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new EnvoyFilter_WaypointMatch_FilterMatch_SubFilterMatch. Required by controller-gen.
+func (in *EnvoyFilter_WaypointMatch_FilterMatch_SubFilterMatch) DeepCopyInterface() interface{} {
+ return in.DeepCopy()
+}
+
// DeepCopyInto supports using EnvoyFilter_Patch within kubernetes types, where deepcopy-gen is used.
func (in *EnvoyFilter_Patch) DeepCopyInto(out *EnvoyFilter_Patch) {
p := proto.Clone(in).(*EnvoyFilter_Patch)
diff --git a/networking/v1alpha3/envoy_filter_json.gen.go b/networking/v1alpha3/envoy_filter_json.gen.go
index 24c1268e55..85de2d0f0d 100644
--- a/networking/v1alpha3/envoy_filter_json.gen.go
+++ b/networking/v1alpha3/envoy_filter_json.gen.go
@@ -116,6 +116,50 @@ func (this *EnvoyFilter_ListenerMatch_SubFilterMatch) UnmarshalJSON(b []byte) er
return EnvoyFilterUnmarshaler.Unmarshal(bytes.NewReader(b), this)
}
+// MarshalJSON is a custom marshaler for EnvoyFilter_WaypointMatch
+func (this *EnvoyFilter_WaypointMatch) MarshalJSON() ([]byte, error) {
+ str, err := EnvoyFilterMarshaler.MarshalToString(this)
+ return []byte(str), err
+}
+
+// UnmarshalJSON is a custom unmarshaler for EnvoyFilter_WaypointMatch
+func (this *EnvoyFilter_WaypointMatch) UnmarshalJSON(b []byte) error {
+ return EnvoyFilterUnmarshaler.Unmarshal(bytes.NewReader(b), this)
+}
+
+// MarshalJSON is a custom marshaler for EnvoyFilter_WaypointMatch_RouteMatch
+func (this *EnvoyFilter_WaypointMatch_RouteMatch) MarshalJSON() ([]byte, error) {
+ str, err := EnvoyFilterMarshaler.MarshalToString(this)
+ return []byte(str), err
+}
+
+// UnmarshalJSON is a custom unmarshaler for EnvoyFilter_WaypointMatch_RouteMatch
+func (this *EnvoyFilter_WaypointMatch_RouteMatch) UnmarshalJSON(b []byte) error {
+ return EnvoyFilterUnmarshaler.Unmarshal(bytes.NewReader(b), this)
+}
+
+// MarshalJSON is a custom marshaler for EnvoyFilter_WaypointMatch_FilterMatch
+func (this *EnvoyFilter_WaypointMatch_FilterMatch) MarshalJSON() ([]byte, error) {
+ str, err := EnvoyFilterMarshaler.MarshalToString(this)
+ return []byte(str), err
+}
+
+// UnmarshalJSON is a custom unmarshaler for EnvoyFilter_WaypointMatch_FilterMatch
+func (this *EnvoyFilter_WaypointMatch_FilterMatch) UnmarshalJSON(b []byte) error {
+ return EnvoyFilterUnmarshaler.Unmarshal(bytes.NewReader(b), this)
+}
+
+// MarshalJSON is a custom marshaler for EnvoyFilter_WaypointMatch_FilterMatch_SubFilterMatch
+func (this *EnvoyFilter_WaypointMatch_FilterMatch_SubFilterMatch) MarshalJSON() ([]byte, error) {
+ str, err := EnvoyFilterMarshaler.MarshalToString(this)
+ return []byte(str), err
+}
+
+// UnmarshalJSON is a custom unmarshaler for EnvoyFilter_WaypointMatch_FilterMatch_SubFilterMatch
+func (this *EnvoyFilter_WaypointMatch_FilterMatch_SubFilterMatch) UnmarshalJSON(b []byte) error {
+ return EnvoyFilterUnmarshaler.Unmarshal(bytes.NewReader(b), this)
+}
+
// MarshalJSON is a custom marshaler for EnvoyFilter_Patch
func (this *EnvoyFilter_Patch) MarshalJSON() ([]byte, error) {
str, err := EnvoyFilterMarshaler.MarshalToString(this)
diff --git a/tests/testdata/envoyfilter-invalid.yaml b/tests/testdata/envoyfilter-invalid.yaml
new file mode 100644
index 0000000000..df1d6681aa
--- /dev/null
+++ b/tests/testdata/envoyfilter-invalid.yaml
@@ -0,0 +1,46 @@
+_err: 'spec.configPatches[0].match: Invalid value: "object": only support waypointMatch when context is WAYPOINT'
+apiVersion: networking.istio.io/v1alpha3
+kind: EnvoyFilter
+metadata:
+ name: waypoint-wrong-context
+spec:
+ configPatches:
+ - applyTo: HTTP_FILTER
+ match:
+ context: SIDECAR_INBOUND
+ waypoint:
+ filter:
+ name: "envoy.filters.network.http_connection_manager"
+ subFilter:
+ name: "envoy.filters.http.router"
+---
+_err: 'spec.configPatches[0].match: Invalid value: "object": only support waypointMatch when context is WAYPOINT'
+apiVersion: networking.istio.io/v1alpha3
+kind: EnvoyFilter
+metadata:
+ name: waypoint-wrong-match
+spec:
+ configPatches:
+ - applyTo: HTTP_FILTER
+ match:
+ context: WAYPOINT
+ listener:
+ filterChain:
+ filter:
+ name: "envoy.filters.network.http_connection_manager"
+ subFilter:
+ name: "envoy.filters.http.router"
+---
+_err: 'spec.configPatches[0].match.waypoint.portNumber: Invalid value: "integer": port must be between 1-65535'
+apiVersion: networking.istio.io/v1alpha3
+kind: EnvoyFilter
+metadata:
+ name: waypoint-wrong-port
+spec:
+ configPatches:
+ - applyTo: HTTP_FILTER
+ match:
+ context: WAYPOINT
+ waypoint:
+ portNumber: 65536
+---
\ No newline at end of file
diff --git a/tests/testdata/envoyfilter-valid.yaml b/tests/testdata/envoyfilter-valid.yaml
new file mode 100644
index 0000000000..359d39fa69
--- /dev/null
+++ b/tests/testdata/envoyfilter-valid.yaml
@@ -0,0 +1,38 @@
+apiVersion: networking.istio.io/v1alpha3
+kind: EnvoyFilter
+metadata:
+ name: waypoint-http-filter
+spec:
+ configPatches:
+ - applyTo: HTTP_FILTER
+ match:
+ context: WAYPOINT
+ waypoint:
+ filter:
+ name: "envoy.filters.network.http_connection_manager"
+ subFilter:
+ name: "envoy.filters.http.router"
+---
+apiVersion: networking.istio.io/v1alpha3
+kind: EnvoyFilter
+metadata:
+ name: waypoint-cluster
+spec:
+ configPatches:
+ - applyTo: CLUSTER
+ match:
+ context: WAYPOINT
+ waypoint: {}
+---
+apiVersion: networking.istio.io/v1alpha3
+kind: EnvoyFilter
+metadata:
+ name: add-cluster
+spec:
+ configPatches:
+ - applyTo: CLUSTER
+ patch:
+ operation: ADD
+ value: # cluster specification
+ name: "lua_cluster"
+---