Split setting conditions into respective files

Author: bjee19

internal/controller/state/graph/gateway.go

@@ -1,9 +1,6 @@
 package graph
 
 import (
-	"net"
-	"reflect"
-
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -183,24 +180,11 @@ func validateGateway(gw *v1.Gateway, gc *GatewayClass, npCfg *NginxProxy) ([]con
 	}
 
 	for _, address := range gw.Spec.Addresses {
-		switch {
-		case address.Type == nil:
+		if address.Type == nil {
 			conds = append(conds, conditions.NewGatewayUnsupportedAddress("AddressType must be specified"))
-		case *address.Type == v1.IPAddressType:
-			ip := net.ParseIP(address.Value)
-			// Address 198.51.100.0 is reserved for documentation.
-			// This is needed to give the conformance tests an example unusable address.
-			if address.Value != "" && (ip == nil || reflect.DeepEqual(ip, net.ParseIP("198.51.100.0"))) {
-				conds = append(conds, conditions.NewGatewayUnusableAddress("Invalid IP address"))
-			}
-		default:
+		} else if *address.Type != v1.IPAddressType {
 			conds = append(conds, conditions.NewGatewayUnsupportedAddress("Only AddressType IPAddress is supported"))
 		}
-
-		if address.Value == "" {
-			conds = append(conds, conditions.NewGatewayAddressNotAssigned("Dynamically assigned addresses for the "+
-				"Gateway addresses field are not supported, value must be specified"))
-		}
 	}
 
 	// we evaluate validity before validating parametersRef because an invalid parametersRef/NginxProxy does not

internal/controller/state/graph/gateway_test.go

@@ -1513,61 +1513,6 @@ func TestBuildGateway(t *testing.T) {
 				},
 			},
 		},
-		{
-			name: "invalid gateway; gateway addresses value unspecified",
-			gateway: createGateway(gatewayCfg{
-				name:      "gateway-addr-value-unspecified",
-				listeners: []v1.Listener{foo80Listener1},
-				addresses: []v1.GatewaySpecAddress{
-					{
-						Type:  helpers.GetPointer(v1.IPAddressType),
-						Value: "",
-					},
-				},
-			}),
-			gatewayClass: validGC,
-			expected: map[types.NamespacedName]*Gateway{
-				{Namespace: "test", Name: "gateway-addr-value-unspecified"}: {
-					Source: getLastCreatedGateway(),
-					DeploymentName: types.NamespacedName{
-						Namespace: "test",
-						Name:      controller.CreateNginxResourceName("gateway-addr-value-unspecified", gcName),
-					},
-					Valid: false,
-					Conditions: []conditions.Condition{
-						conditions.NewGatewayAddressNotAssigned("Dynamically assigned addresses for the Gateway " +
-							"addresses field are not supported, value must be specified"),
-					},
-				},
-			},
-		},
-		{
-			name: "invalid gateway; gateway addresses value unusable",
-			gateway: createGateway(gatewayCfg{
-				name:      "gateway-addr-unusable",
-				listeners: []v1.Listener{foo80Listener1},
-				addresses: []v1.GatewaySpecAddress{
-					{
-						Type:  helpers.GetPointer(v1.IPAddressType),
-						Value: "<invalid-ip>",
-					},
-				},
-			}),
-			gatewayClass: validGC,
-			expected: map[types.NamespacedName]*Gateway{
-				{Namespace: "test", Name: "gateway-addr-unusable"}: {
-					Source: getLastCreatedGateway(),
-					DeploymentName: types.NamespacedName{
-						Namespace: "test",
-						Name:      controller.CreateNginxResourceName("gateway-addr-unusable", gcName),
-					},
-					Valid: false,
-					Conditions: []conditions.Condition{
-						conditions.NewGatewayUnusableAddress("Invalid IP address"),
-					},
-				},
-			},
-		},
 	}
 
 	secretResolver := newSecretResolver(

internal/controller/status/prepare_requests.go

@@ -2,6 +2,8 @@ package status
 
 import (
 	"fmt"
+	"net"
+	"reflect"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -17,6 +19,10 @@ import (
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds"
 )
 
+// UnusableGatewayIPAddress 198.51.100.0 is a publicly reserved IP address specifically for documentation.
+// This is needed to give the conformance tests an example valid ip unusable address.
+const UnusableGatewayIPAddress = "198.51.100.0"
+
 // PrepareRouteRequests prepares status UpdateRequests for the given Routes.
 func PrepareRouteRequests(
 	l4routes map[graph.L4RouteKey]*graph.L4Route,
@@ -329,6 +335,18 @@ func prepareGatewayRequest(
 		)
 	}
 
+	for _, address := range gateway.Source.Spec.Addresses {
+		if address.Value == "" {
+			gwConds = append(gwConds, conditions.NewGatewayAddressNotAssigned("Dynamically assigned addresses for the "+
+				"Gateway addresses field are not supported, value must be specified"))
+		} else {
+			ip := net.ParseIP(address.Value)
+			if ip == nil || reflect.DeepEqual(ip, net.ParseIP(UnusableGatewayIPAddress)) {
+				gwConds = append(gwConds, conditions.NewGatewayUnusableAddress("Invalid IP address"))
+			}
+		}
+	}
+
 	apiGwConds := conditions.ConvertConditions(
 		conditions.DeduplicateConditions(gwConds),
 		gateway.Source.Generation,

internal/controller/status/prepare_requests_test.go

@@ -850,6 +850,11 @@ func TestBuildGatewayStatuses(t *testing.T) {
 			},
 		}
 	}
+	createGatewayWithAddresses := func(addresses []v1.GatewaySpecAddress) *v1.Gateway {
+		g := createGateway()
+		g.Spec.Addresses = addresses
+		return g
+	}
 
 	transitionTime := helpers.PrepareTimeForFakeClient(metav1.Now())
 
@@ -1341,6 +1346,105 @@ func TestBuildGatewayStatuses(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "valid gateway; valid listeners; gateway addresses value unspecified",
+			gateway: &graph.Gateway{
+				Source: createGatewayWithAddresses([]v1.GatewaySpecAddress{
+					{
+						Type:  helpers.GetPointer(v1.IPAddressType),
+						Value: "",
+					},
+				}),
+				Listeners: []*graph.Listener{
+					{
+						Name:   "listener-valid-1",
+						Valid:  true,
+						Routes: map[graph.RouteKey]*graph.L7Route{routeKey: {}},
+					},
+				},
+				Valid: true,
+			},
+			expected: map[types.NamespacedName]v1.GatewayStatus{
+				{Namespace: "test", Name: "gateway"}: {
+					Addresses: addr,
+					Conditions: []metav1.Condition{
+						{
+							Type:               string(v1.GatewayConditionAccepted),
+							Status:             metav1.ConditionTrue,
+							ObservedGeneration: 2,
+							LastTransitionTime: transitionTime,
+							Reason:             string(v1.GatewayReasonAccepted),
+							Message:            "Gateway is accepted",
+						},
+						{
+							Type:               string(v1.GatewayConditionProgrammed),
+							Status:             metav1.ConditionFalse,
+							ObservedGeneration: 2,
+							LastTransitionTime: transitionTime,
+							Reason:             string(v1.GatewayReasonAddressNotAssigned),
+							Message: "Dynamically assigned addresses for the Gateway addresses " +
+								"field are not supported, value must be specified",
+						},
+					},
+					Listeners: []v1.ListenerStatus{
+						{
+							Name:           "listener-valid-1",
+							AttachedRoutes: 1,
+							Conditions:     validListenerConditions,
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "valid gateway; valid listeners; gateway addresses value unusable",
+			gateway: &graph.Gateway{
+				Source: createGatewayWithAddresses([]v1.GatewaySpecAddress{
+					{
+						Type:  helpers.GetPointer(v1.IPAddressType),
+						Value: "<invalid-ip>",
+					},
+				}),
+				Listeners: []*graph.Listener{
+					{
+						Name:   "listener-valid-1",
+						Valid:  true,
+						Routes: map[graph.RouteKey]*graph.L7Route{routeKey: {}},
+					},
+				},
+				Valid: true,
+			},
+			expected: map[types.NamespacedName]v1.GatewayStatus{
+				{Namespace: "test", Name: "gateway"}: {
+					Addresses: addr,
+					Conditions: []metav1.Condition{
+						{
+							Type:               string(v1.GatewayConditionAccepted),
+							Status:             metav1.ConditionTrue,
+							ObservedGeneration: 2,
+							LastTransitionTime: transitionTime,
+							Reason:             string(v1.GatewayReasonAccepted),
+							Message:            "Gateway is accepted",
+						},
+						{
+							Type:               string(v1.GatewayConditionProgrammed),
+							Status:             metav1.ConditionFalse,
+							ObservedGeneration: 2,
+							LastTransitionTime: transitionTime,
+							Reason:             string(v1.GatewayReasonAddressNotUsable),
+							Message:            "Invalid IP address",
+						},
+					},
+					Listeners: []v1.ListenerStatus{
+						{
+							Name:           "listener-valid-1",
+							AttachedRoutes: 1,
+							Conditions:     validListenerConditions,
+						},
+					},
+				},
+			},
+		},
 	}
 
 	for _, test := range tests {

tests/conformance/conformance_test.go

@@ -32,6 +32,10 @@ import (
 	"sigs.k8s.io/yaml"
 )
 
+// UnusableGatewayIPAddress 198.51.100.0 is a publicly reserved IP address specifically for documentation.
+// This is needed to give the conformance tests an example valid ip unusable address.
+const UnusableGatewayIPAddress = "198.51.100.0"
+
 func TestConformance(t *testing.T) {
 	g := NewWithT(t)
 
@@ -46,7 +50,7 @@ func TestConformance(t *testing.T) {
 	opts := conformance.DefaultOptions(t)
 
 	ipaddressType := v1.IPAddressType
-	opts.UnusableNetworkAddresses = []v1beta1.GatewaySpecAddress{{Type: &ipaddressType, Value: "198.51.100.0"}}
+	opts.UnusableNetworkAddresses = []v1beta1.GatewaySpecAddress{{Type: &ipaddressType, Value: UnusableGatewayIPAddress}}
 	opts.UsableNetworkAddresses = []v1beta1.GatewaySpecAddress{{Type: &ipaddressType, Value: "192.0.2.1"}}
 
 	opts.Implementation = conf_v1.Implementation{