rebase yet again

Author: zac-nixon

apis/gateway/v1beta1/loadbalancerconfig_types.go

@@ -251,7 +251,7 @@ type LoadBalancerConfigurationSpec struct {
 	// specifies whether you want the controller to configure security group rules on Node/Pod for traffic access
 	// when you specify securityGroups
 	// +optional
-	ManageBackendSecurityGroupRules bool `json:"manageBackendSecurityGroupRules,omitempty"`
+	ManageBackendSecurityGroupRules *bool `json:"manageBackendSecurityGroupRules,omitempty"`
 
 	// MinimumLoadBalancerCapacity define the capacity reservation for LoadBalancers
 	// +optional

controllers/gateway/gateway_controller.go

@@ -214,26 +214,6 @@ func (r *gatewayReconciler) reconcileHelper(ctx context.Context, req reconcile.R
 	return r.reconcileUpdate(ctx, gw, stack, lb, backendSGRequired)
 }
 
-func (r *gatewayReconciler) getLoadBalancerConfigForGateway(ctx context.Context, k8sClient client.Client, gw *gwv1.Gateway, gwClass *gwv1.GatewayClass) (*elbv2gw.LoadBalancerConfiguration, error) {
-	var gwParametersRef *gwv1.ParametersReference
-	if gw.Spec.Infrastructure != nil && gw.Spec.Infrastructure.ParametersRef != nil {
-		// Convert local param ref -> namespaced param ref
-		ns := gwv1.Namespace(gw.Namespace)
-		gwParametersRef = &gwv1.ParametersReference{
-			Group:     gw.Spec.Infrastructure.ParametersRef.Group,
-			Kind:      gw.Spec.Infrastructure.ParametersRef.Kind,
-			Name:      gw.Spec.Infrastructure.ParametersRef.Name,
-			Namespace: &ns,
-		}
-	}
-
-	gatewayLBConfig, err := r.resolveLoadBalancerConfig(ctx, k8sClient, gwParametersRef)
-	if err != nil {
-		return &elbv2gw.LoadBalancerConfiguration{}, err
-	}
-	return gatewayLBConfig, nil
-}
-
 func (r *gatewayReconciler) resolveLoadBalancerConfig(ctx context.Context, k8sClient client.Client, reference *gwv1.ParametersReference) (*elbv2gw.LoadBalancerConfiguration, error) {
 	var lbConf *elbv2gw.LoadBalancerConfiguration
 	var err error

pkg/gateway/model/model_build_loadbalancer_test.go

@@ -16,7 +16,7 @@ import (
 func TestLoadBalancerBuilderImpl_BuildLoadBalancerName(t *testing.T) {
 	tests := []struct {
 		name        string
-		lbConf      *elbv2gw.LoadBalancerConfiguration
+		lbConf      elbv2gw.LoadBalancerConfiguration
 		gw          *gwv1.Gateway
 		scheme      elbv2model.LoadBalancerScheme
 		clusterName string
@@ -25,7 +25,7 @@ func TestLoadBalancerBuilderImpl_BuildLoadBalancerName(t *testing.T) {
 	}{
 		{
 			name: "specify load balancer name in load balancer configuration",
-			lbConf: &elbv2gw.LoadBalancerConfiguration{
+			lbConf: elbv2gw.LoadBalancerConfiguration{
 				Spec: elbv2gw.LoadBalancerConfigurationSpec{
 					LoadBalancerName: aws.String("my-example-lb"),
 				},
@@ -37,7 +37,7 @@ func TestLoadBalancerBuilderImpl_BuildLoadBalancerName(t *testing.T) {
 		},
 		{
 			name: "generated name with valid characters",
-			lbConf: &elbv2gw.LoadBalancerConfiguration{
+			lbConf: elbv2gw.LoadBalancerConfiguration{
 				Spec: elbv2gw.LoadBalancerConfigurationSpec{},
 			},
 			gw: &gwv1.Gateway{
@@ -54,7 +54,7 @@ func TestLoadBalancerBuilderImpl_BuildLoadBalancerName(t *testing.T) {
 		},
 		{
 			name: "generated name with invalid characters",
-			lbConf: &elbv2gw.LoadBalancerConfiguration{
+			lbConf: elbv2gw.LoadBalancerConfiguration{
 				Spec: elbv2gw.LoadBalancerConfigurationSpec{},
 			},
 			gw: &gwv1.Gateway{
@@ -71,7 +71,7 @@ func TestLoadBalancerBuilderImpl_BuildLoadBalancerName(t *testing.T) {
 		},
 		{
 			name: "provide long namespace and name",
-			lbConf: &elbv2gw.LoadBalancerConfiguration{
+			lbConf: elbv2gw.LoadBalancerConfiguration{
 				Spec: elbv2gw.LoadBalancerConfigurationSpec{},
 			},
 			gw: &gwv1.Gateway{
@@ -121,12 +121,12 @@ func TestLoadBalancerBuilderImpl_BuildLoadBalancerName(t *testing.T) {
 func TestLoadBalancerBuilderImpl_BuildLoadBalancerAttributes(t *testing.T) {
 	tests := []struct {
 		name   string
-		lbConf *elbv2gw.LoadBalancerConfiguration
+		lbConf elbv2gw.LoadBalancerConfiguration
 		want   []elbv2model.LoadBalancerAttribute
 	}{
 		{
 			name: "provide single attribute",
-			lbConf: &elbv2gw.LoadBalancerConfiguration{
+			lbConf: elbv2gw.LoadBalancerConfiguration{
 				Spec: elbv2gw.LoadBalancerConfigurationSpec{
 					LoadBalancerAttributes: []elbv2gw.LoadBalancerAttribute{
 						{
@@ -145,7 +145,7 @@ func TestLoadBalancerBuilderImpl_BuildLoadBalancerAttributes(t *testing.T) {
 		},
 		{
 			name: "provide multiple attributes",
-			lbConf: &elbv2gw.LoadBalancerConfiguration{
+			lbConf: elbv2gw.LoadBalancerConfiguration{
 				Spec: elbv2gw.LoadBalancerConfigurationSpec{
 					LoadBalancerAttributes: []elbv2gw.LoadBalancerAttribute{
 						{
@@ -184,12 +184,12 @@ func TestLoadBalancerBuilderImpl_BuildLoadBalancerAttributes(t *testing.T) {
 func TestLoadBalancerBuilderImpl_BuildLoadBalancerMinimumCapacity(t *testing.T) {
 	tests := []struct {
 		name   string
-		lbConf *elbv2gw.LoadBalancerConfiguration
+		lbConf elbv2gw.LoadBalancerConfiguration
 		want   *elbv2model.MinimumLoadBalancerCapacity
 	}{
 		{
 			name: "MinimumLoadBalancerCapacity is nil",
-			lbConf: &elbv2gw.LoadBalancerConfiguration{
+			lbConf: elbv2gw.LoadBalancerConfiguration{
 				Spec: elbv2gw.LoadBalancerConfigurationSpec{
 					MinimumLoadBalancerCapacity: nil,
 				},
@@ -198,7 +198,7 @@ func TestLoadBalancerBuilderImpl_BuildLoadBalancerMinimumCapacity(t *testing.T)
 		},
 		{
 			name: "MinimumLoadBalancerCapacity with a valid value",
-			lbConf: &elbv2gw.LoadBalancerConfiguration{
+			lbConf: elbv2gw.LoadBalancerConfiguration{
 				Spec: elbv2gw.LoadBalancerConfigurationSpec{
 					MinimumLoadBalancerCapacity: &elbv2gw.MinimumLoadBalancerCapacity{
 						CapacityUnits: 100,