OSSM-6177 Prevent nil pointer dereference when analysis is enabled an…

…d GatewayAPI is disabled (#977)
maistra · Apr 4, 2024 · 4c5ddc8 · 4c5ddc8
1 parent 08e9b7b
commit 4c5ddc8
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pilot/pkg/config/kube/crdclient/client.go b/pilot/pkg/config/kube/crdclient/client.go
@@ -430,7 +430,10 @@ func handleCRDAdd(cl *Client, name string) {
 	resourceGVK := s.GroupVersionKind()
 	gvr := s.GroupVersionResource()
 
-	if cl.client.IsMultiTenant() && resourceGVK == gvk.GatewayClass {
+	if !features.EnableGatewayAPI && s.Group() == gvk.KubernetesGateway.Group {
+		scope.Infof("Skipping CRD %v as GatewayAPI support is not enabled", s.GroupVersionKind())
+		return
+	} else if cl.client.IsMultiTenant() && resourceGVK == gvk.GatewayClass {
 		scope.Infof("Skipping CRD %v as it is not compatible with maistra multi-tenancy", s.GroupVersionKind())
 		return
 	}