GatewayClass Supported features

controller/gatewayclass/controller.go

@@ -55,29 +55,32 @@
 		return ctrl.Result{}, nil
 	}
 
-	if !gwc.IsAccepted() {
-		oldGwc := gwc.DeepCopy()
+	oldGwc := gwc.DeepCopy()
 
-		k8sutils.SetCondition(
-			k8sutils.NewConditionWithGeneration(
-				consts.ConditionType(gatewayv1.GatewayClassConditionStatusAccepted),
-				metav1.ConditionTrue,
-				consts.ConditionReason(gatewayv1.GatewayClassReasonAccepted),
-				"the gatewayclass has been accepted by the operator",
-				gwc.GetGeneration(),
-			),
-			gwc,
-		)
-		if err := r.Status().Patch(ctx, gwc.GatewayClass, client.MergeFrom(oldGwc)); err != nil {
-			if k8serrors.IsConflict(err) {
-				log.Debug(logger, "conflict found when updating GatewayClass, retrying")
-				return ctrl.Result{
-					Requeue:      true,
-					RequeueAfter: controller.RequeueWithoutBackoff,
-				}, nil
-			}
-			return ctrl.Result{}, fmt.Errorf("failed patching GatewayClass: %w", err)
+	k8sutils.SetCondition(
+		k8sutils.NewConditionWithGeneration(
+			consts.ConditionType(gatewayv1.GatewayClassConditionStatusAccepted),
+			metav1.ConditionTrue,
+			consts.ConditionReason(gatewayv1.GatewayClassReasonAccepted),
+			"the gatewayclass has been accepted by the operator",
+			gwc.GetGeneration(),
+		),
+		gwc,
+	)
+
+	if err := setSupportedFeatures(ctx, r.Client, gwc.GatewayClass); err != nil {
+		return ctrl.Result{}, fmt.Errorf("failed setting supported features: %w", err)
+	}
+
+	if err := r.Status().Patch(ctx, gwc.GatewayClass, client.MergeFrom(oldGwc)); err != nil {
+		if k8serrors.IsConflict(err) {
+			log.Debug(logger, "conflict found when updating GatewayClass, retrying")
+			return ctrl.Result{
+				Requeue:      true,
+				RequeueAfter: controller.RequeueWithoutBackoff,
+			}, nil
 		}
+		return ctrl.Result{}, fmt.Errorf("failed patching GatewayClass: %w", err)
 	}
 
 	return ctrl.Result{}, nil

controller/gatewayclass/controller_reconciler_utils.go

@@ -0,0 +1,28 @@
+package gatewayclass
+
+import (
+	"context"
+
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
+
+	operatorv1beta1 "github.com/kong/gateway-operator/api/v1beta1"
+	"github.com/kong/gateway-operator/pkg/consts"
+	k8sutils "github.com/kong/gateway-operator/pkg/utils/kubernetes"
+)
+
+func setSupportedFeatures(ctx context.Context, client client.Client, gwc *gatewayv1.GatewayClass, gatewayConfig *operatorv1beta1.GatewayConfiguration) error {
+	flavor := getRouterFlavor(gatewayConfig)
+	gwc.Status.SupportedFeatures = []gatewayv1.SupportedFeature{}
+}
+
+func getRouterFlavor(gatewayConfig *operatorv1beta1.GatewayConfiguration) consts.RouterFlavor {
+	if gatewayConfig == nil ||
+		gatewayConfig.Spec.ControlPlaneOptions == nil ||
+		gatewayConfig.Spec.ControlPlaneOptions.Deployment.PodTemplateSpec == nil {
+		return consts.RouterFlavorExpressions
+	}
+
+	k8sutils.GetEnvValueFromContainer(ctx, k8sutils.GetPodContainerByName(&gatewayConfig.Spec.ControlPlaneOptions.Deployment.PodTemplateSpec.Spec, consts.ControlPlaneControllerContainerName, gatewayConfig.Namespace, gatewayConfig.Name), consts.RouterFlavorEnvVar, consts.RouterFlavorExpressions)
+	return *gatewayConfig.Spec.ControlPlaneOptions.RouterFlavor
+}

pkg/consts/controlplane.go

@@ -62,5 +62,20 @@ const (
 	ControlPlaneAdmissionWebhookVolumeMountPath = "/admission-webhook"
 )
 
+// -----------------------------------------------------------------------------
+// Consts - Router flavor parameters
+// -----------------------------------------------------------------------------
+
+// RouterFlavor represents the flavor of the Kong router.
+// ref: https://docs.konghq.com/gateway/latest/reference/configuration/#router_flavor
+type RouterFlavor string
+
+const (
+	// RouterFlavorTraditionalCompatible is the traditional compatible router flavor.
+	RouterFlavorTraditionalCompatible RouterFlavor = "traditional_compatible"
+	// RouterFlavorExpressions is the expressions router flavor.
+	RouterFlavorExpressions RouterFlavor = "expressions"
+)
+
 // TODO: https://github.com/Kong/gateway-operator/issues/141
 // Extract as constants all the Env var Keys used to configure the ControlPlane.

pkg/gatewayapi/supportedfeatures.go

@@ -0,0 +1,35 @@
+package gatewayapi
+
+import (
+	"k8s.io/apimachinery/pkg/util/sets"
+	"sigs.k8s.io/gateway-api/pkg/features"
+)
+
+var (
+	TraditionalCompatibleRouterSupportedFeatures = commonSupportedFeatures.Clone().Insert(
+	// add here the traditional compatible router specific features
+	)
+
+	ExpressionsRouterSupportedFeatures = commonSupportedFeatures.Clone().Insert(
+		// extended
+		features.SupportHTTPRouteMethodMatching,
+		features.SupportHTTPRouteQueryParamMatching,
+	)
+)
+
+var (
+	commonSupportedFeatures = sets.New(
+		// core features
+		features.SupportHTTPRoute,
+		features.SupportGateway,
+		features.SupportReferenceGrant,
+
+		// Gateway extended
+		features.SupportGatewayPort8080,
+
+		// HTTPRoute extended
+		features.SupportHTTPRouteResponseHeaderModification,
+		features.SupportHTTPRoutePathRewrite,
+		features.SupportHTTPRouteHostRewrite,
+	)
+)

test/conformance/conformance_test.go

@@ -24,6 +24,7 @@ import (
 	gwtypes "github.com/kong/gateway-operator/internal/types"
 	"github.com/kong/gateway-operator/modules/manager/metadata"
 	"github.com/kong/gateway-operator/pkg/consts"
+	gatewayapipkg "github.com/kong/gateway-operator/pkg/gatewayapi"
 	testutils "github.com/kong/gateway-operator/pkg/utils/test"
 	"github.com/kong/gateway-operator/pkg/vars"
 )
@@ -36,33 +37,6 @@ var skippedTestsForTraditionalCompatibleRouter = []string{
 	tests.HTTPRouteInvalidBackendRefUnknownKind.ShortName,
 }
 
-var (
-	commonSupportedFeatures = sets.New(
-		// core features
-		features.SupportHTTPRoute,
-		features.SupportGateway,
-		features.SupportReferenceGrant,
-
-		// Gateway extended
-		features.SupportGatewayPort8080,
-
-		// HTTPRoute extended
-		features.SupportHTTPRouteResponseHeaderModification,
-		features.SupportHTTPRoutePathRewrite,
-		features.SupportHTTPRouteHostRewrite,
-	)
-
-	traditionalCompatibleRouterSupportedFeatures = commonSupportedFeatures.Clone().Insert(
-	// add here the traditional compatible router specific features
-	)
-
-	expressionsRouterSupportedFeatures = commonSupportedFeatures.Clone().Insert(
-		// extended
-		features.SupportHTTPRouteMethodMatching,
-		features.SupportHTTPRouteQueryParamMatching,
-	)
-)
-
 type ConformanceConfig struct {
 	KongRouterFlavor RouterFlavor
 }
@@ -83,11 +57,11 @@ func TestGatewayConformance(t *testing.T) {
 	case RouterFlavorTraditionalCompatible:
 		skippedTests = skippedTestsForTraditionalCompatibleRouter
 		config.KongRouterFlavor = RouterFlavorTraditionalCompatible
-		supportedFeatures = traditionalCompatibleRouterSupportedFeatures
+		supportedFeatures = gatewayapipkg.TraditionalCompatibleRouterSupportedFeatures
 	case RouterFlavorExpressions:
 		skippedTests = skippedTestsForExpressionsRouter
 		config.KongRouterFlavor = RouterFlavorExpressions
-		supportedFeatures = expressionsRouterSupportedFeatures
+		supportedFeatures = gatewayapipkg.ExpressionsRouterSupportedFeatures
 	default:
 		t.Fatalf("unsupported KongRouterFlavor: %s", rf)
 	}

test/conformance/router_flavor.go

@@ -3,31 +3,22 @@ package conformance
 import (
 	"os"
 	"testing"
-)
-
-// RouterFlavor represents the flavor of the Kong router.
-// ref: https://docs.konghq.com/gateway/latest/reference/configuration/#router_flavor
-type RouterFlavor string
 
-const (
-	// RouterFlavorTraditionalCompatible is the traditional compatible router flavor.
-	RouterFlavorTraditionalCompatible RouterFlavor = "traditional_compatible"
-	// RouterFlavorExpressions is the expressions router flavor.
-	RouterFlavorExpressions RouterFlavor = "expressions"
+	"github.com/kong/gateway-operator/pkg/consts"
 )
 
 // KongRouterFlavor returns router mode of Kong in tests. Currently supports:
 // - `traditional_compatible`
 // - `expressions`
-func KongRouterFlavor(t *testing.T) RouterFlavor {
+func KongRouterFlavor(t *testing.T) consts.RouterFlavor {
 	rf := os.Getenv("TEST_KONG_ROUTER_FLAVOR")
 	switch {
 	case rf == "":
-		return RouterFlavorTraditionalCompatible
-	case rf == string(RouterFlavorTraditionalCompatible):
-		return RouterFlavorTraditionalCompatible
-	case rf == string(RouterFlavorExpressions):
-		return RouterFlavorExpressions
+		return consts.RouterFlavorTraditionalCompatible
+	case rf == string(consts.RouterFlavorTraditionalCompatible):
+		return consts.RouterFlavorTraditionalCompatible
+	case rf == string(consts.RouterFlavorExpressions):
+		return consts.RouterFlavorExpressions
 	case rf == "traditional":
 		t.Logf("Kong router flavor 'traditional' is deprecated, please use 'traditional_compatible' instead")
 		t.FailNow()