Merge pull request #1707 from arkodg/supported-kinds-bug

Add explicit equality checks for SupportedKinds

Author: k8s-ci-robot

conformance/utils/kubernetes/helpers.go

@@ -32,7 +32,6 @@ import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
@@ -636,12 +635,29 @@ func listenersMatch(t *testing.T, expected, actual []v1beta1.ListenerStatus) boo
 		// Ensure that the expected Listener.SupportedKinds items are present in actual Listener.SupportedKinds
 		// Find the items instead of performing an exact match of the slice because the implementation
 		// might support more Kinds than defined in the test
-		eSupportedKindsSet := sets.New(eListener.SupportedKinds...)
-		aSupportedKindsSet := sets.New(aListener.SupportedKinds...)
-		if !aSupportedKindsSet.IsSuperset(eSupportedKindsSet) {
-			t.Logf("Expected %v kinds to be present in SupportedKinds", eSupportedKindsSet.Difference(aSupportedKindsSet))
-			return false
+		for _, eKind := range eListener.SupportedKinds {
+			found := false
+
+			for _, aKind := range aListener.SupportedKinds {
+				if eKind.Group == nil {
+					eKind.Group = (*v1beta1.Group)(&v1beta1.GroupVersion.Group)
+				}
+
+				if aKind.Group == nil {
+					aKind.Group = (*v1beta1.Group)(&v1beta1.GroupVersion.Group)
+				}
+
+				if *eKind.Group == *aKind.Group && eKind.Kind == aKind.Kind {
+					found = true
+					break
+				}
+			}
+			if !found {
+				t.Logf("Expected Group:%s Kind:%s to be present in SupportedKinds", *eKind.Group, eKind.Kind)
+				return false
+			}
 		}
+
 		if aListener.AttachedRoutes != eListener.AttachedRoutes {
 			t.Logf("Expected AttachedRoutes to be %v, got %v", eListener.AttachedRoutes, aListener.AttachedRoutes)
 			return false

conformance/utils/kubernetes/helpers_test.go

@@ -0,0 +1,138 @@
+/*
+Copyright 2022 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kubernetes
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"sigs.k8s.io/gateway-api/apis/v1alpha2"
+	"sigs.k8s.io/gateway-api/apis/v1beta1"
+)
+
+func Test_listenersMatch(t *testing.T) {
+	tests := []struct {
+		name     string
+		expected []v1beta1.ListenerStatus
+		actual   []v1beta1.ListenerStatus
+		want     bool
+	}{
+		{
+			name: "SupportedKinds: expected empty and actual is non empty",
+			expected: []v1beta1.ListenerStatus{
+				{
+					SupportedKinds: []v1beta1.RouteGroupKind{},
+				},
+			},
+			actual: []v1beta1.ListenerStatus{
+				{
+					SupportedKinds: []v1beta1.RouteGroupKind{
+						{
+							Group: (*v1beta1.Group)(&v1beta1.GroupVersion.Group),
+							Kind:  v1beta1.Kind("HTTPRoute"),
+						},
+					},
+				},
+			},
+			want: false,
+		},
+		{
+			name: "SupportedKinds: expected and actual are equal",
+			expected: []v1beta1.ListenerStatus{
+				{
+					SupportedKinds: []v1beta1.RouteGroupKind{
+						{
+							Group: (*v1beta1.Group)(&v1beta1.GroupVersion.Group),
+							Kind:  v1beta1.Kind("HTTPRoute"),
+						},
+					},
+				},
+			},
+			actual: []v1beta1.ListenerStatus{
+				{
+					SupportedKinds: []v1beta1.RouteGroupKind{
+						{
+							Group: (*v1beta1.Group)(&v1beta1.GroupVersion.Group),
+							Kind:  v1beta1.Kind("HTTPRoute"),
+						},
+					},
+				},
+			},
+			want: true,
+		},
+		{
+			name: "SupportedKinds: expected kind not found in actual",
+			expected: []v1beta1.ListenerStatus{
+				{
+					SupportedKinds: []v1beta1.RouteGroupKind{
+						{
+							Group: (*v1beta1.Group)(&v1beta1.GroupVersion.Group),
+							Kind:  v1beta1.Kind("HTTPRoute"),
+						},
+					},
+				},
+			},
+			actual: []v1beta1.ListenerStatus{
+				{
+					SupportedKinds: []v1beta1.RouteGroupKind{
+						{
+							Group: (*v1beta1.Group)(&v1alpha2.GroupVersion.Group),
+							Kind:  v1beta1.Kind("GRPCRoute"),
+						},
+					},
+				},
+			},
+			want: false,
+		},
+		{
+			name: "SupportedKinds: expected is a subset of actual",
+			expected: []v1beta1.ListenerStatus{
+				{
+					SupportedKinds: []v1beta1.RouteGroupKind{
+						{
+							Group: (*v1beta1.Group)(&v1beta1.GroupVersion.Group),
+							Kind:  v1beta1.Kind("HTTPRoute"),
+						},
+					},
+				},
+			},
+			actual: []v1beta1.ListenerStatus{
+				{
+					SupportedKinds: []v1beta1.RouteGroupKind{
+						{
+							Group: (*v1beta1.Group)(&v1alpha2.GroupVersion.Group),
+							Kind:  v1beta1.Kind("GRPCRoute"),
+						},
+						{
+							Group: (*v1beta1.Group)(&v1beta1.GroupVersion.Group),
+							Kind:  v1beta1.Kind("HTTPRoute"),
+						},
+					},
+				},
+			},
+			want: true,
+		},
+	}
+
+	for _, test := range tests {
+		test := test
+		t.Run(test.name, func(t *testing.T) {
+			assert.Equal(t, test.want, listenersMatch(t, test.expected, test.actual))
+		})
+	}
+}