chore: merge

Author: 1ms-ms

.go-version

@@ -1 +1 @@
-1.24.5
+1.24.6

apis/elbv2/v1beta1/ingressclassparams_types.go

@@ -117,6 +117,10 @@ type IPAMConfiguration struct {
 // IngressClassParamsSpec defines the desired state of IngressClassParams
 // +kubebuilder:validation:XValidation:rule="!(has(self.prefixListsIDs) && has(self.PrefixListsIDs))", message="cannot specify both 'prefixListsIDs' and 'PrefixListsIDs' fields"
 type IngressClassParamsSpec struct {
+	// LoadBalancerName defines the name of the load balancer that will be created with this IngressClassParams.
+	// +optional
+	LoadBalancerName string `json:"loadBalancerName,omitempty"`
+
 	// CertificateArn specifies the ARN of the certificates for all Ingresses that belong to IngressClass with this IngressClassParams.
 	// +optional
 	CertificateArn []string `json:"certificateArn,omitempty"`
@@ -185,6 +189,10 @@ type IngressClassParamsSpec struct {
 	// PrefixListsIDs defines the security group prefix lists for all Ingresses that belong to IngressClass with this IngressClassParams.
 	// +optional
 	PrefixListsIDs []string `json:"prefixListsIDs,omitempty"`
+
+	// WAFv2ACLArn specifies ARN for the Amazon WAFv2 web ACL.
+	// +optional
+	WAFv2ACLArn string `json:"wafv2AclArn"`
 }
 
 // +kubebuilder:object:root=true

apis/gateway/v1beta1/listenerruleconfig_types.go

@@ -59,7 +59,7 @@ type ActionType string
 const (
 	ActionTypeForward             ActionType = "forward"
 	ActionTypeFixedResponse       ActionType = "fixed-response"
-	ActionTypeEnumRedirect        ActionType = "redirect"
+	ActionTypeRedirect            ActionType = "redirect"
 	ActionTypeAuthenticateCognito ActionType = "authenticate-cognito"
 	ActionTypeAuthenticateOIDC    ActionType = "authenticate-oidc"
 )
@@ -81,7 +81,7 @@ type TargetGroupStickinessConfig struct {
 
 // Information about a forward action.
 type ForwardActionConfig struct {
-
+	// +kubebuilder:default={}
 	// The target group stickiness for the rule.
 	// Note: ForwardActionConfig only supports target group stickiness configuration through CRD.
 	// All other forward action fields must be set through the Gateway API native way.
@@ -263,6 +263,7 @@ type Action struct {
 // +kubebuilder:validation:XValidation:rule="!has(self.actions) || size(self.actions) > 0",message="At least one action must be specified if actions field is present"
 // +kubebuilder:validation:XValidation:rule="!has(self.actions) || self.actions.all(a, a.type == 'authenticate-oidc' || a.type == 'authenticate-cognito' || a.type == 'fixed-response' || a.type == 'forward' || a.type == 'redirect')",message="Only forward, redirect, authenticate-oidc, authenticate-cognito, and fixed-response action types are supported"
 // +kubebuilder:validation:XValidation:rule="!has(self.actions) || size(self.actions.filter(a, a.type == 'authenticate-oidc' || a.type == 'authenticate-cognito')) <= 1",message="At most one authentication action (either authenticate-oidc or authenticate-cognito) can be specified"
+// +kubebuilder:validation:XValidation:rule="!has(self.actions) || size(self.actions.filter(a, a.type == 'fixed-response' || a.type == 'forward' || a.type == 'redirect')) <= 1",message="At most one routing action (fixed-response or forward or redirect) can be specified"
 type ListenerRuleSpec struct {
 	// Actions defines the set of actions to be performed when conditions match.
 	// This CRD implementation currently supports only  authenticate-oidc, authenticate-cognito, and fixed-response action types fully and forward and redirect actions partially

config/crd/bases/elbv2.k8s.aws_ingressclassparams.yaml

@@ -11,7 +11,7 @@ spec:
     kind: IngressClassParams
     listKind: IngressClassParamsList
     plural: ingressclassparams
-    singular: ingressclassparams
+    singular: ingressclassparam
   scope: Cluster
   versions:
   - additionalPrinterColumns:
@@ -149,6 +149,10 @@ spec:
                   - value
                   type: object
                 type: array
+              loadBalancerName:
+                description: LoadBalancerName defines the name of the load balancer
+                  that will be created with this IngressClassParams.
+                type: string
               minimumLoadBalancerCapacity:
                 description: MinimumLoadBalancerCapacity define the capacity reservation
                   for LoadBalancers for all Ingress that belong to IngressClass with
@@ -279,6 +283,9 @@ spec:
                 - instance
                 - ip
                 type: string
+              wafv2AclArn:
+                description: WAFv2ACLArn specifies ARN for the Amazon WAFv2 web ACL.
+                type: string
             type: object
             x-kubernetes-validations:
             - message: cannot specify both 'prefixListsIDs' and 'PrefixListsIDs' fields