Merge pull request #1139 from robscott/revert-address-match

Reverting GEP 735 from implemented to provisional

Author: k8s-ci-robot

apis/v1alpha2/shared_types.go

@@ -465,57 +465,6 @@ type AnnotationKey string
 // +kubebuilder:validation:MaxLength=4096
 type AnnotationValue string
 
-// AddressRouteMatches defines AddressMatch rules for inbound traffic according to
-// source and/or destination address of a packet or connection.
-type AddressRouteMatches struct {
-	// SourceAddresses indicates the originating (source) network
-	// addresses which are valid for routing traffic.
-	//
-	// Support: Extended
-	SourceAddresses []AddressMatch `json:"sourceAddresses"`
-
-	// DestinationAddresses indicates the destination network addresses
-	// which are valid for routing traffic.
-	//
-	// Support: Extended
-	DestinationAddresses []AddressMatch `json:"destinationAddresses"`
-}
-
-// AddressMatch defines matching rules for network addresses by type.
-type AddressMatch struct {
-	// Type of the address, either IPAddress or NamedAddress.
-	//
-	// If NamedAddress is used this is a custom and specific value for each
-	// implementation to handle (and add validation for) according to their
-	// own needs.
-	//
-	// For IPAddress the implementor may expect either IPv4 or IPv6.
-	//
-	// Support: Core (IPAddress)
-	// Support: Custom (NamedAddress)
-	//
-	// +optional
-	// +kubebuilder:validation:Enum=IPAddress;NamedAddress
-	// +kubebuilder:default=IPAddress
-	Type *AddressType `json:"type,omitempty"`
-
-	// Value of the address. The validity of the values will depend
-	// on the type and support by the controller.
-	//
-	// If implementations support proxy-protocol (see:
-	// https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt) they
-	// must respect the connection metadata from proxy-protocol
-	// in the match logic implemented for these address values.
-	//
-	// Examples: `1.2.3.4`, `128::1`, `my-named-address`.
-	//
-	// Support: Core
-	//
-	// +kubebuilder:validation:MinLength=1
-	// +kubebuilder:validation:MaxLength=253
-	Value string `json:"value"`
-}
-
 // AddressType defines how a network address is represented as a text string.
 type AddressType string
 

apis/v1alpha2/tcproute_types.go

@@ -59,13 +59,6 @@ type TCPRouteStatus struct {
 
 // TCPRouteRule is the configuration for a given rule.
 type TCPRouteRule struct {
-	// Matches are rules for routing traffic to backends based on addresses.
-	//
-	// +optional
-	// +kubebuilder:validation:MaxItems=16
-	//  <gateway:experimental>
-	Matches []AddressRouteMatches `json:"matches,omitempty"`
-
 	// BackendRefs defines the backend(s) where matching requests should be
 	// sent. If unspecified or invalid (refers to a non-existent resource or a
 	// Service with no endpoints), the underlying implementation MUST actively

apis/v1alpha2/udproute_types.go

@@ -59,13 +59,6 @@ type UDPRouteStatus struct {
 
 // UDPRouteRule is the configuration for a given rule.
 type UDPRouteRule struct {
-	// Matches add rules for filtering traffic to backends based on addresses.
-	//
-	// +optional
-	// +kubebuilder:validation:MaxItems=16
-	//  <gateway:experimental>
-	Matches []AddressRouteMatches `json:"matches,omitempty"`
-
 	// BackendRefs defines the backend(s) where matching requests should be
 	// sent. If unspecified or invalid (refers to a non-existent resource or a
 	// Service with no endpoints), the underlying implementation MUST actively

apis/v1alpha2/zz_generated.deepcopy.go

@@ -1,7 +1,7 @@
 # GEP-735: TCP and UDP addresses matching
 
 * Issue: [#735](https://github.com/kubernetes-sigs/gateway-api/issues/735)
-* Status: Implemented
+* Status: Provisional
 
 ## TLDR