test(conformance): gatewayclassGenerationBump pass (#4645)

Signed-off-by: Mattia Lavacca <lavacca.mattia@gmail.com>

internal/controllers/gateway/gateway_utils.go

@@ -85,8 +85,8 @@ func isObjectUnmanaged(anns map[string]string) bool {
 // isGatewayClassControlledAndUnmanaged returns boolean if the GatewayClass
 // is controlled by this controller and is configured for unmanaged mode.
 func isGatewayClassControlledAndUnmanaged(gatewayClass *GatewayClass) bool {
-	isUnamanaged := isObjectUnmanaged(gatewayClass.Annotations)
-	return gatewayClass.Spec.ControllerName == GetControllerName() && isUnamanaged
+	isUnmanaged := isObjectUnmanaged(gatewayClass.Annotations)
+	return gatewayClass.Spec.ControllerName == GetControllerName() && isUnmanaged
 }
 
 // pruneGatewayStatusConds cleans out old status conditions if the Gateway currently has more

test/conformance/gateway_conformance_test.go

@@ -3,11 +3,18 @@
 package conformance
 
 import (
+	"context"
 	"testing"
+	"time"
 
+	"github.com/stretchr/testify/require"
+	k8stypes "k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
 	"sigs.k8s.io/gateway-api/conformance/tests"
 	"sigs.k8s.io/gateway-api/conformance/utils/suite"
 
+	"github.com/kong/kubernetes-ingress-controller/v2/internal/annotations"
 	"github.com/kong/kubernetes-ingress-controller/v2/test/internal/testenv"
 )
 
@@ -17,8 +24,6 @@ var commonSkippedTests = []string{
 	// https://github.com/Kong/kubernetes-ingress-controller/issues/4563
 	tests.GatewayWithAttachedRoutesWithPort8080.ShortName,
 	tests.HTTPRouteRedirectPortAndScheme.ShortName,
-	// https://github.com/Kong/kubernetes-ingress-controller/issues/3680
-	tests.GatewayClassObservedGenerationBump.ShortName,
 	// https://github.com/Kong/kubernetes-ingress-controller/issues/3679
 	tests.HTTPRouteQueryParamMatching.ShortName,
 	// https://github.com/Kong/kubernetes-ingress-controller/issues/3681
@@ -62,7 +67,7 @@ func TestGatewayConformance(t *testing.T) {
 		t.Skip("skipping standard conformance tests")
 	}
 
-	client, gatewayClassName := prepareEnvForGatewayConformanceTests(t)
+	k8sClient, gatewayClassName := prepareEnvForGatewayConformanceTests(t)
 	// Conformance tests are run for both configs with and without
 	// KONG_TEST_EXPRESSION_ROUTES='true'.
 	skipTests := skippedTestsForTraditionalRoutes
@@ -71,7 +76,7 @@ func TestGatewayConformance(t *testing.T) {
 	}
 
 	cSuite := suite.New(suite.Options{
-		Client:                     client,
+		Client:                     k8sClient,
 		GatewayClassName:           gatewayClassName,
 		Debug:                      true,
 		CleanupBaseResources:       !testenv.IsCI(),
@@ -83,9 +88,33 @@ func TestGatewayConformance(t *testing.T) {
 	t.Log("starting the gateway conformance test suite")
 	cSuite.Setup(t)
 
+	// We need to wait for the GatewayClass created by the test GatewayClassObservedGenerationBump
+	// and patch it with the unmanaged annotation to make it reconciled by the GatewayClass
+	// controller. The timeout and the tick are pretty loose because of the indeterministic
+	// test order execution.
+	go require.Eventually(t, func() bool {
+		return ensureTestGatewayClassIsUnmanaged(ctx, k8sClient)
+	}, 10*time.Minute, 10*time.Second)
+
 	// To work with individual tests only, you can disable the normal Run call and construct a slice containing a
 	// single test only, e.g.:
 	//
-	//cSuite.Run(t, []suite.ConformanceTest{tests.HTTPRouteRedirectPortAndScheme})
+	//cSuite.Run(t, []suite.ConformanceTest{tests.GatewayClassObservedGenerationBump})
 	cSuite.Run(t, tests.ConformanceTests)
 }
+
+func ensureTestGatewayClassIsUnmanaged(ctx context.Context, k8sClient client.Client) bool {
+	gwcNamespacedName := k8stypes.NamespacedName{Name: "gatewayclass-observed-generation-bump"}
+	gwc := &gatewayv1beta1.GatewayClass{}
+	if err := k8sClient.Get(ctx, gwcNamespacedName, gwc); err != nil {
+		return false
+	}
+	if gwc.Annotations == nil {
+		gwc.Annotations = map[string]string{}
+	}
+	gwc.Annotations[annotations.GatewayClassUnmanagedAnnotation] = annotations.GatewayClassUnmanagedAnnotationValuePlaceholder
+	if err := k8sClient.Update(ctx, gwc); err != nil {
+		return false
+	}
+	return true
+}