Add SupportedFeatures to GatewayClassStatus

ciarams87 · ciarams87 · commit ec9b53a3c7fc · 2025-11-12T09:07:59.000Z
diff --git a/internal/controller/status/gatewayclass.go b/internal/controller/status/gatewayclass.go
@@ -0,0 +1,32 @@
+package status
+
+import (
+	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
+)
+
+// SupportedFeatures returns the list of features supported by NGINX Gateway Fabric.
+// The list must be sorted in ascending alphabetical order.
+func SupportedFeatures() []gatewayv1.SupportedFeature {
+	return []gatewayv1.SupportedFeature{
+		{Name: "BackendTLSPolicy"},
+		{Name: "GatewayAddressEmpty"},
+		{Name: "GatewayHTTPListenerIsolation"},
+		{Name: "GatewayInfrastructurePropagation"},
+		{Name: "GatewayPort8080"},
+		{Name: "GatewayStaticAddresses"},
+		{Name: "HTTPRouteBackendProtocolWebSocket"},
+		{Name: "HTTPRouteDestinationPortMatching"},
+		{Name: "HTTPRouteHostRewrite"},
+		{Name: "HTTPRouteMethodMatching"},
+		{Name: "HTTPRouteParentRefPort"},
+		{Name: "HTTPRoutePathRedirect"},
+		{Name: "HTTPRoutePathRewrite"},
+		{Name: "HTTPRoutePortRedirect"},
+		{Name: "HTTPRouteQueryParamMatching"},
+		{Name: "HTTPRouteRequestMirror"},
+		{Name: "HTTPRouteRequestMultipleMirrors"},
+		{Name: "HTTPRouteRequestPercentageMirror"},
+		{Name: "HTTPRouteResponseHeaderModification"},
+		{Name: "HTTPRouteSchemeRedirect"},
+	}
+}
diff --git a/internal/controller/status/gatewayclass_test.go b/internal/controller/status/gatewayclass_test.go
@@ -0,0 +1,60 @@
+package status
+
+import (
+	"slices"
+	"testing"
+
+	. "github.com/onsi/gomega"
+	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
+)
+
+func TestSupportedFeatures(t *testing.T) {
+	t.Parallel()
+	g := NewWithT(t)
+
+	features := SupportedFeatures()
+
+	// Verify we have the expected features
+	expectedFeatures := []gatewayv1.FeatureName{
+		"BackendTLSPolicy",
+		"GatewayAddressEmpty",
+		"GatewayHTTPListenerIsolation",
+		"GatewayInfrastructurePropagation",
+		"GatewayPort8080",
+		"GatewayStaticAddresses",
+		"HTTPRouteBackendProtocolWebSocket",
+		"HTTPRouteDestinationPortMatching",
+		"HTTPRouteHostRewrite",
+		"HTTPRouteMethodMatching",
+		"HTTPRouteParentRefPort",
+		"HTTPRoutePathRedirect",
+		"HTTPRoutePathRewrite",
+		"HTTPRoutePortRedirect",
+		"HTTPRouteQueryParamMatching",
+		"HTTPRouteRequestMirror",
+		"HTTPRouteRequestMultipleMirrors",
+		"HTTPRouteRequestPercentageMirror",
+		"HTTPRouteResponseHeaderModification",
+		"HTTPRouteSchemeRedirect",
+	}
+
+	g.Expect(features).To(HaveLen(len(expectedFeatures)))
+
+	// Verify all expected features are present
+	for _, expected := range expectedFeatures {
+		g.Expect(slices.ContainsFunc(features, func(f gatewayv1.SupportedFeature) bool {
+			return f.Name == expected
+		})).To(BeTrue(), "expected feature %s not found", expected)
+	}
+
+	// Verify the list is sorted alphabetically
+	g.Expect(slices.IsSortedFunc(features, func(a, b gatewayv1.SupportedFeature) int {
+		if a.Name < b.Name {
+			return -1
+		}
+		if a.Name > b.Name {
+			return 1
+		}
+		return 0
+	})).To(BeTrue(), "features should be sorted alphabetically")
+}
diff --git a/internal/controller/status/prepare_requests.go b/internal/controller/status/prepare_requests.go
@@ -210,7 +210,8 @@ func PrepareGatewayClassRequests(
 			NsName:       client.ObjectKeyFromObject(gc.Source),
 			ResourceType: &v1.GatewayClass{},
 			Setter: newGatewayClassStatusSetter(v1.GatewayClassStatus{
-				Conditions: apiConds,
+				Conditions:        apiConds,
+				SupportedFeatures: SupportedFeatures(),
 			}),
 		}
 
@@ -227,6 +228,7 @@ func PrepareGatewayClassRequests(
 					gwClass.Generation,
 					transitionTime,
 				),
+				SupportedFeatures: SupportedFeatures(),
 			}),
 		}
 
diff --git a/internal/controller/status/prepare_requests_test.go b/internal/controller/status/prepare_requests_test.go
@@ -644,6 +644,7 @@ func TestBuildGatewayClassStatuses(t *testing.T) {
 							Message:            conditions.GatewayClassMessageGatewayClassConflict,
 						},
 					},
+					SupportedFeatures: SupportedFeatures(),
 				},
 				{Name: "ignored-2"}: {
 					Conditions: []metav1.Condition{
@@ -656,6 +657,7 @@ func TestBuildGatewayClassStatuses(t *testing.T) {
 							Message:            conditions.GatewayClassMessageGatewayClassConflict,
 						},
 					},
+					SupportedFeatures: SupportedFeatures(),
 				},
 			},
 		},
@@ -689,6 +691,7 @@ func TestBuildGatewayClassStatuses(t *testing.T) {
 							Message:            "The Gateway API CRD versions are supported",
 						},
 					},
+					SupportedFeatures: SupportedFeatures(),
 				},
 			},
 		},
diff --git a/internal/controller/status/status_setters.go b/internal/controller/status/status_setters.go
@@ -41,7 +41,7 @@ func newGatewayStatusSetter(status gatewayv1.GatewayStatus) Setter {
 
 func gwStatusEqual(prev, cur gatewayv1.GatewayStatus) bool {
 	addressesEqual := slices.EqualFunc(prev.Addresses, cur.Addresses, func(a1, a2 gatewayv1.GatewayStatusAddress) bool {
-		if !helpers.EqualPointers[gatewayv1.AddressType](a1.Type, a2.Type) {
+		if !helpers.EqualPointers(a1.Type, a2.Type) {
 			return false
 		}
 
@@ -217,7 +217,7 @@ func newGatewayClassStatusSetter(status gatewayv1.GatewayClassStatus) Setter {
 	return func(obj client.Object) (wasSet bool) {
 		gc := helpers.MustCastObject[*gatewayv1.GatewayClass](obj)
 
-		if ConditionsEqual(gc.Status.Conditions, status.Conditions) {
+		if gcStatusEqual(gc.Status, status) {
 			return false
 		}
 
@@ -226,6 +226,16 @@ func newGatewayClassStatusSetter(status gatewayv1.GatewayClassStatus) Setter {
 	}
 }
 
+func gcStatusEqual(prev, cur gatewayv1.GatewayClassStatus) bool {
+	if !ConditionsEqual(prev.Conditions, cur.Conditions) {
+		return false
+	}
+
+	return slices.EqualFunc(prev.SupportedFeatures, cur.SupportedFeatures, func(f1, f2 gatewayv1.SupportedFeature) bool {
+		return f1.Name == f2.Name
+	})
+}
+
 func newBackendTLSPolicyStatusSetter(
 	status gatewayv1.PolicyStatus,
 	gatewayCtlrName string,
diff --git a/internal/controller/status/status_setters_test.go b/internal/controller/status/status_setters_test.go
@@ -696,6 +696,30 @@ func TestNewGatewayClassStatusSetter(t *testing.T) {
 			},
 			expStatusSet: false,
 		},
+		{
+			name: "GatewayClass has same conditions but different SupportedFeatures",
+			newStatus: gatewayv1.GatewayClassStatus{
+				Conditions:        []metav1.Condition{{Message: "same condition"}},
+				SupportedFeatures: []gatewayv1.SupportedFeature{{Name: "Feature1"}},
+			},
+			status: gatewayv1.GatewayClassStatus{
+				Conditions:        []metav1.Condition{{Message: "same condition"}},
+				SupportedFeatures: []gatewayv1.SupportedFeature{{Name: "Feature2"}},
+			},
+			expStatusSet: true,
+		},
+		{
+			name: "GatewayClass has same conditions and same SupportedFeatures",
+			newStatus: gatewayv1.GatewayClassStatus{
+				Conditions:        []metav1.Condition{{Message: "same condition"}},
+				SupportedFeatures: []gatewayv1.SupportedFeature{{Name: "Feature1"}},
+			},
+			status: gatewayv1.GatewayClassStatus{
+				Conditions:        []metav1.Condition{{Message: "same condition"}},
+				SupportedFeatures: []gatewayv1.SupportedFeature{{Name: "Feature1"}},
+			},
+			expStatusSet: false,
+		},
 	}
 
 	for _, test := range tests {
diff --git a/tests/Makefile b/tests/Makefile
@@ -12,7 +12,6 @@ GW_SERVICE_TYPE = NodePort## Service type to use for the gateway
 NGF_VERSION ?= edge## NGF version to be tested
 PULL_POLICY ?= Never## Pull policy for the images
 NGINX_CONF_DIR = internal/controller/nginx/conf
-SUPPORTED_EXTENDED_FEATURES = HTTPRouteQueryParamMatching,HTTPRouteMethodMatching,HTTPRoutePortRedirect,HTTPRouteSchemeRedirect,HTTPRouteHostRewrite,HTTPRoutePathRewrite,GatewayPort8080,GatewayAddressEmpty,HTTPRouteResponseHeaderModification,HTTPRoutePathRedirect,GatewayHTTPListenerIsolation,GatewayInfrastructurePropagation,HTTPRouteRequestMirror,HTTPRouteRequestMultipleMirrors,HTTPRouteRequestPercentageMirror,HTTPRouteBackendProtocolWebSocket,HTTPRouteParentRefPort,HTTPRouteDestinationPortMatching,GatewayStaticAddresses,BackendTLSPolicy
 SUPPORTED_EXTENDED_FEATURES_OPENSHIFT = HTTPRouteQueryParamMatching,HTTPRouteMethodMatching,HTTPRoutePortRedirect,HTTPRouteSchemeRedirect,HTTPRouteHostRewrite,HTTPRoutePathRewrite,GatewayPort8080,GatewayAddressEmpty,HTTPRouteResponseHeaderModification,HTTPRoutePathRedirect,GatewayHTTPListenerIsolation,GatewayInfrastructurePropagation,HTTPRouteRequestMirror,HTTPRouteRequestMultipleMirrors,HTTPRouteRequestPercentageMirror,HTTPRouteBackendProtocolWebSocket,HTTPRouteParentRefPort,HTTPRouteDestinationPortMatching
 STANDARD_CONFORMANCE_PROFILES = GATEWAY-HTTP,GATEWAY-GRPC
 EXPERIMENTAL_CONFORMANCE_PROFILES = GATEWAY-TLS
@@ -58,7 +57,7 @@ run-conformance-tests: ## Run conformance tests
 		--image=$(CONFORMANCE_PREFIX):$(CONFORMANCE_TAG) --image-pull-policy=Never \
 		--overrides='{ "spec": { "serviceAccountName": "conformance" }	}' \
 		--restart=Never -- sh -c "go test -v . -tags conformance,experimental -args --gateway-class=$(GATEWAY_CLASS) \
-						        --supported-features=$(SUPPORTED_EXTENDED_FEATURES) --version=$(NGF_VERSION) --skip-tests=$(SKIP_TESTS) --conformance-profiles=$(CONFORMANCE_PROFILES) \
+						        --version=$(NGF_VERSION) --skip-tests=$(SKIP_TESTS) --conformance-profiles=$(CONFORMANCE_PROFILES) \
 								--report-output=output.txt; cat output.txt" | tee output.txt
 	./scripts/check-pod-exit-code.sh conformance
 	sed -e '1,/CONFORMANCE PROFILE/d' output.txt > conformance-profile.yaml
