Change to ignore Mesh features in GWC instead of erroring out. (#3938)

* Change to ignore Mesh features in GWC instead of erroring out.

* Added comment on what new code does.

* Punctuation.

* Added extended mesh feture for test suite unit test.

Author: bexxmodd

conformance/utils/suite/suite.go

@@ -211,8 +211,13 @@ func NewConformanceTestSuite(options ConformanceOptions) (*ConformanceTestSuite,
 			return nil, fmt.Errorf("cannot infer supported features: %w", err)
 		}
 
-		if hasMeshFeatures(supportedFeatures) {
-			return nil, fmt.Errorf("mesh features should not be populated in GatewayClass")
+		// If Mesh features are populated in the GatewayClass we remove them from the supported features set.
+		meshFeatureNames := features.SetsToNamesSet(features.MeshCoreFeatures, features.MeshExtendedFeatures)
+		for _, f := range supportedFeatures.UnsortedList() {
+			if meshFeatureNames.Has(f) {
+				supportedFeatures.Delete(f)
+				fmt.Printf("WARNING: Mesh feature %q should not be populated in GatewayClass, skipping...", f)
+			}
 		}
 		source = supportedFeaturesSourceInferred
 	}
@@ -660,7 +665,3 @@ func getAPIVersionAndChannel(crds []apiextensionsv1.CustomResourceDefinition) (v
 
 	return version, channel, nil
 }
-
-func hasMeshFeatures(f FeaturesSet) bool {
-	return f.HasAny(features.SetsToNamesSet(features.MeshCoreFeatures, features.MeshExtendedFeatures).UnsortedList()...)
-}

conformance/utils/suite/suite_test.go

@@ -22,7 +22,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -545,9 +544,8 @@ func TestGWCPublishedMeshFeatures(t *testing.T) {
 			},
 			SupportedFeatures: featureNamesToSet([]string{
 				string(features.SupportGateway),
-				string(features.SupportGatewayStaticAddresses),
+				string(features.SupportMesh),
 				string(features.SupportMeshClusterIPMatching),
-				string(features.SupportMeshConsumerRoute),
 			}),
 		},
 	}
@@ -568,9 +566,12 @@ func TestGWCPublishedMeshFeatures(t *testing.T) {
 		Client:            fakeClient,
 	}
 
-	_, err := NewConformanceTestSuite(options)
-	if err == nil {
-		t.Fatalf("expected an error but got nil")
+	suite, err := NewConformanceTestSuite(options)
+	if err != nil {
+		t.Fatalf("error initializing conformance suite: %v", err)
+	}
+	if suite.SupportedFeatures.HasAny(features.SetsToNamesSet(features.MeshCoreFeatures, features.MeshExtendedFeatures).UnsortedList()...) {
+		t.Errorf("Mesh features should be skipped, got: %v", suite.SupportedFeatures.UnsortedList())
 	}
 }