Merge pull request #4137 from zac-nixon/znixon/subnet-discovery-gw

Subnet Discovery for Gateway API

Author: zac-nixon

apis/gateway/v1beta1/loadbalancerconfig_types.go

@@ -26,15 +26,6 @@ const (
 	LoadBalancerIpAddressTypeDualstackWithoutPublicIpv4 LoadBalancerIpAddressType = "dualstack-without-public-ipv4"
 )
 
-// +kubebuilder:validation:Enum=on;off
-// EnablePrefixForIpv6SourceNatEnum defines the enum values for EnablePrefixForIpv6SourceNat
-type EnablePrefixForIpv6SourceNatEnum string
-
-const (
-	EnablePrefixForIpv6SourceNatEnumOn  EnablePrefixForIpv6SourceNatEnum = "on"
-	EnablePrefixForIpv6SourceNatEnumOff EnablePrefixForIpv6SourceNatEnum = "off"
-)
-
 // LoadBalancerAttribute defines LB attribute.
 type LoadBalancerAttribute struct {
 	// The key of the attribute.
@@ -64,20 +55,25 @@ type LoadBalancerTag struct {
 
 // SubnetConfiguration defines the subnet settings for a Load Balancer.
 type SubnetConfiguration struct {
-	// identifier name or id for the subnet
+	// identifier [Application LoadBalancer / Network LoadBalancer] name or id for the subnet
+	// +optional
 	Identifier string `json:"identifier"`
 
-	// eipAllocation the EIP name for this subnet.
+	// eipAllocation [Network LoadBalancer] the EIP name for this subnet.
 	// +optional
 	EIPAllocation *string `json:"eipAllocation,omitempty"`
 
-	// privateIPv4Allocation the private ipv4 address to assign to this subnet.
+	// privateIPv4Allocation [Network LoadBalancer] the private ipv4 address to assign to this subnet.
 	// +optional
 	PrivateIPv4Allocation *string `json:"privateIPv4Allocation,omitempty"`
 
-	// privateIPv6Allocation the private ipv6 address to assign to this subnet.
+	// IPv6Allocation [Network LoadBalancer] the ipv6 address to assign to this subnet.
 	// +optional
-	PrivateIPv6Allocation *string `json:"privateIPv6Allocation,omitempty"`
+	IPv6Allocation *string `json:"ipv6Allocation,omitempty"`
+
+	// SourceNatIPv6Prefix [Network LoadBalancer] The IPv6 prefix to use for source NAT. Specify an IPv6 prefix (/80 netmask) from the subnet CIDR block or auto_assigned to use an IPv6 prefix selected at random from the subnet CIDR block.
+	// +optional
+	SourceNatIPv6Prefix *string `json:"sourceNatIPv6Prefix,omitempty"`
 }
 
 // +kubebuilder:validation:Enum=HTTP1Only;HTTP2Only;HTTP2Optional;HTTP2Preferred;None
@@ -183,10 +179,6 @@ type LoadBalancerConfigurationSpec struct {
 	// +optional
 	IpAddressType *LoadBalancerIpAddressType `json:"ipAddressType,omitempty"`
 
-	// enablePrefixForIpv6SourceNat indicates whether to use an IPv6 prefix from each subnet for source NAT for Network Load Balancers with UDP listeners.
-	// +optional
-	EnablePrefixForIpv6SourceNat *EnablePrefixForIpv6SourceNatEnum `json:"enablePrefixForIpv6SourceNat,omitempty"`
-
 	// enforceSecurityGroupInboundRulesOnPrivateLinkTraffic Indicates whether to evaluate inbound security group rules for traffic sent to a Network Load Balancer through Amazon Web Services PrivateLink.
 	// +optional
 	EnforceSecurityGroupInboundRulesOnPrivateLinkTraffic *string `json:"enforceSecurityGroupInboundRulesOnPrivateLinkTraffic,omitempty"`
@@ -196,9 +188,16 @@ type LoadBalancerConfigurationSpec struct {
 	CustomerOwnedIpv4Pool *string `json:"customerOwnedIpv4Pool,omitempty"`
 
 	// loadBalancerSubnets is an optional list of subnet configurations to be used in the LB
+	// This value takes precedence over loadBalancerSubnetsSelector if both are selected.
 	// +optional
 	LoadBalancerSubnets *[]SubnetConfiguration `json:"loadBalancerSubnets,omitempty"`
 
+	// LoadBalancerSubnetsSelector specifies subnets in the load balancer's VPC where each
+	// tag specified in the map key contains one of the values in the corresponding
+	// value list.
+	// +optional
+	LoadBalancerSubnetsSelector *map[string][]string `json:"loadBalancerSubnetsSelector,omitempty"`
+
 	// listenerConfigurations is an optional list of configurations for each listener on LB
 	// +optional
 	ListenerConfigurations *[]ListenerConfiguration `json:"listenerConfigurations,omitempty"`

apis/gateway/v1beta1/zz_generated.deepcopy.go

@@ -48,14 +48,6 @@ spec:
                 description: customerOwnedIpv4Pool is the ID of the customer-owned
                   address for Application Load Balancers on Outposts pool.
                 type: string
-              enablePrefixForIpv6SourceNat:
-                description: enablePrefixForIpv6SourceNat indicates whether to use
-                  an IPv6 prefix from each subnet for source NAT for Network Load
-                  Balancers with UDP listeners.
-                enum:
-                - "on"
-                - "off"
-                type: string
               enforceSecurityGroupInboundRulesOnPrivateLinkTraffic:
                 description: enforceSecurityGroupInboundRulesOnPrivateLinkTraffic
                   Indicates whether to evaluate inbound security group rules for traffic
@@ -178,30 +170,48 @@ spec:
                 minLength: 1
                 type: string
               loadBalancerSubnets:
-                description: loadBalancerSubnets is an optional list of subnet configurations
-                  to be used in the LB
+                description: |-
+                  loadBalancerSubnets is an optional list of subnet configurations to be used in the LB
+                  This value takes precedence over loadBalancerSubnetsSelector if both are selected.
                 items:
                   description: SubnetConfiguration defines the subnet settings for
                     a Load Balancer.
                   properties:
                     eipAllocation:
-                      description: eipAllocation the EIP name for this subnet.
+                      description: eipAllocation [Network LoadBalancer] the EIP name
+                        for this subnet.
                       type: string
                     identifier:
-                      description: identifier name or id for the subnet
+                      description: identifier [Application LoadBalancer / Network
+                        LoadBalancer] name or id for the subnet
+                      type: string
+                    ipv6Allocation:
+                      description: IPv6Allocation [Network LoadBalancer] the ipv6
+                        address to assign to this subnet.
                       type: string
                     privateIPv4Allocation:
-                      description: privateIPv4Allocation the private ipv4 address
-                        to assign to this subnet.
+                      description: privateIPv4Allocation [Network LoadBalancer] the
+                        private ipv4 address to assign to this subnet.
                       type: string
-                    privateIPv6Allocation:
-                      description: privateIPv6Allocation the private ipv6 address
-                        to assign to this subnet.
+                    sourceNatIPv6Prefix:
+                      description: SourceNatIPv6Prefix [Network LoadBalancer] The
+                        IPv6 prefix to use for source NAT. Specify an IPv6 prefix
+                        (/80 netmask) from the subnet CIDR block or auto_assigned
+                        to use an IPv6 prefix selected at random from the subnet CIDR
+                        block.
                       type: string
-                  required:
-                  - identifier
                   type: object
                 type: array
+              loadBalancerSubnetsSelector:
+                additionalProperties:
+                  items:
+                    type: string
+                  type: array
+                description: |-
+                  LoadBalancerSubnetsSelector specifies subnets in the load balancer's VPC where each
+                  tag specified in the map key contains one of the values in the corresponding
+                  value list.
+                type: object
               scheme:
                 description: scheme defines the type of LB to provision. If unspecified,
                   it will be automatically inferred.

config/crd/gateway/gateway-crds.yaml

@@ -49,14 +49,6 @@ spec:
                 description: customerOwnedIpv4Pool is the ID of the customer-owned
                   address for Application Load Balancers on Outposts pool.
                 type: string
-              enablePrefixForIpv6SourceNat:
-                description: enablePrefixForIpv6SourceNat indicates whether to use
-                  an IPv6 prefix from each subnet for source NAT for Network Load
-                  Balancers with UDP listeners.
-                enum:
-                - "on"
-                - "off"
-                type: string
               enforceSecurityGroupInboundRulesOnPrivateLinkTraffic:
                 description: enforceSecurityGroupInboundRulesOnPrivateLinkTraffic
                   Indicates whether to evaluate inbound security group rules for traffic
@@ -179,30 +171,48 @@ spec:
                 minLength: 1
                 type: string
               loadBalancerSubnets:
-                description: loadBalancerSubnets is an optional list of subnet configurations
-                  to be used in the LB
+                description: |-
+                  loadBalancerSubnets is an optional list of subnet configurations to be used in the LB
+                  This value takes precedence over loadBalancerSubnetsSelector if both are selected.
                 items:
                   description: SubnetConfiguration defines the subnet settings for
                     a Load Balancer.
                   properties:
                     eipAllocation:
-                      description: eipAllocation the EIP name for this subnet.
+                      description: eipAllocation [Network LoadBalancer] the EIP name
+                        for this subnet.
                       type: string
                     identifier:
-                      description: identifier name or id for the subnet
+                      description: identifier [Application LoadBalancer / Network
+                        LoadBalancer] name or id for the subnet
+                      type: string
+                    ipv6Allocation:
+                      description: IPv6Allocation [Network LoadBalancer] the ipv6
+                        address to assign to this subnet.
                       type: string
                     privateIPv4Allocation:
-                      description: privateIPv4Allocation the private ipv4 address
-                        to assign to this subnet.
+                      description: privateIPv4Allocation [Network LoadBalancer] the
+                        private ipv4 address to assign to this subnet.
                       type: string
-                    privateIPv6Allocation:
-                      description: privateIPv6Allocation the private ipv6 address
-                        to assign to this subnet.
+                    sourceNatIPv6Prefix:
+                      description: SourceNatIPv6Prefix [Network LoadBalancer] The
+                        IPv6 prefix to use for source NAT. Specify an IPv6 prefix
+                        (/80 netmask) from the subnet CIDR block or auto_assigned
+                        to use an IPv6 prefix selected at random from the subnet CIDR
+                        block.
                       type: string
-                  required:
-                  - identifier
                   type: object
                 type: array
+              loadBalancerSubnetsSelector:
+                additionalProperties:
+                  items:
+                    type: string
+                  type: array
+                description: |-
+                  LoadBalancerSubnetsSelector specifies subnets in the load balancer's VPC where each
+                  tag specified in the map key contains one of the values in the corresponding
+                  value list.
+                type: object
               scheme:
                 description: scheme defines the type of LB to provision. If unspecified,
                   it will be automatically inferred.

config/crd/gateway/gateway.k8s.aws_loadbalancerconfigurations.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata: