Merge branch 'main' into make-issuer-optional

Author: bianchi2

.gitignore

@@ -26,3 +26,6 @@ site
 *.bak
 scripts/aws_sdk_model_override/*
 /gomock_reflect*
+config/crd/bases/gateway.k8s.aws_listenerruleconfigurations.yaml
+config/crd/bases/gateway.k8s.aws_loadbalancerconfigurations.yaml
+config/crd/bases/gateway.k8s.aws_targetgroupconfigurations.yaml

.go-version

@@ -1 +1 @@
-1.24.4
+1.24.6

Makefile

@@ -2,7 +2,7 @@
 MAKEFILE_PATH = $(dir $(realpath -s $(firstword $(MAKEFILE_LIST))))
 
 # Image URL to use all building/pushing image targets
-IMG ?= public.ecr.aws/eks/aws-load-balancer-controller:v2.13.3
+IMG ?= public.ecr.aws/eks/aws-load-balancer-controller:v2.13.4
 # Image URL to use for builder stage in Docker build
 GOLANG_VERSION ?= $(shell cat .go-version)
 BUILD_IMAGE ?= public.ecr.aws/docker/library/golang:$(GOLANG_VERSION)
@@ -21,6 +21,9 @@ AWS_SDK_MODEL_OVERRIDE ?= "n"
 # Move Gateway API CRDs from bases directory to gateway directory
 MOVE_GATEWAY_CRDS = mv config/crd/bases/gateway.k8s.aws_* config/crd/gateway/
 
+# Copy combined Gateway API CRDs from bases directory to helm directory
+COPY_GATEWAY_CRDS_TO_HELM = cp config/crd/gateway/gateway-crds.yaml helm/aws-load-balancer-controller/crds/gateway-crds.yaml
+
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
 GOBIN=$(shell go env GOPATH)/bin
@@ -67,6 +70,7 @@ crds: manifests
 	$(MOVE_GATEWAY_CRDS)
 	$(KUSTOMIZE) build config/crd > helm/aws-load-balancer-controller/crds/crds.yaml
 	$(KUSTOMIZE) build config/crd/gateway > config/crd/gateway/gateway-crds.yaml
+	$(COPY_GATEWAY_CRDS_TO_HELM)
 
 # Run go fmt against code
 fmt:

apis/elbv2/v1beta1/ingressclassparams_types.go

@@ -115,7 +115,12 @@ 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"`
@@ -172,8 +177,14 @@ type IngressClassParamsSpec struct {
 	// +optional
 	IPAMConfiguration *IPAMConfiguration `json:"ipamConfiguration,omitempty"`
 
+	// PrefixListsIDsLegacy defines the security group prefix lists for all Ingresses that belong to IngressClass with this IngressClassParams.
+	// Not Recommended, Use PrefixListsIDs (prefixListsIDs in JSON) instead
+	// +optional
+	PrefixListsIDsLegacy []string `json:"PrefixListsIDs,omitempty"`
+
 	// PrefixListsIDs defines the security group prefix lists for all Ingresses that belong to IngressClass with this IngressClassParams.
-	PrefixListsIDs []string `json:"PrefixListsIDs,omitempty"`
+	// +optional
+	PrefixListsIDs []string `json:"prefixListsIDs,omitempty"`
 }
 
 // +kubebuilder:object:root=true

apis/elbv2/v1beta1/targetgroupbinding_types.go

@@ -19,6 +19,7 @@ package v1beta1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
+	"sigs.k8s.io/aws-load-balancer-controller/pkg/model/elbv2"
 )
 
 // +kubebuilder:validation:Enum=instance;ip
@@ -139,6 +140,11 @@ type TargetGroupBindingSpec struct {
 	// +optional
 	TargetType *TargetType `json:"targetType,omitempty"`
 
+	// targetGroupProtocol is the Protocol of the TargetGroup. If unspecified, it will be automatically inferred.
+	// +optional
+	// +kubebuilder:validation:Enum=HTTP;HTTPS;TCP;TLS;UDP;TCP_UDP
+	TargetGroupProtocol *elbv2.Protocol `json:"targetGroupProtocol,omitempty"`
+
 	// serviceRef is a reference to a Kubernetes Service and ServicePort.
 	ServiceRef ServiceReference `json:"serviceRef"`