From 423c95e3304dec268ffafd8c69c512d14a8f99ad Mon Sep 17 00:00:00 2001
From: Madhu RAJAGOPAL <m.rajagopal@f5.com>
Date: Fri, 28 Nov 2025 15:11:46 +1300
Subject: [PATCH 1/2] Fix: Collect Relevant CRD objects based on versions for
 NGF gateway.nginx.org/v1alpha1 is supported by these resource types: *
 ClientSettingsPolicy * NginxGateway * ObservabilityPolicy * SnippetsFilter *
 UpstreamSettingsPolicy gateway.nginx.org/v1alpha2 is supported by these
 resource types: * NginxProxy * ObservabilityPolicy

---
 pkg/crds/crd.go | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkg/crds/crd.go b/pkg/crds/crd.go
index 099968f..8f9826b 100644
--- a/pkg/crds/crd.go
+++ b/pkg/crds/crd.go
@@ -98,15 +98,30 @@ func GetNGFCRDList() []Crd {
 			Version:  "v1alpha1",
 		},
 		{
-			Resource: "nginxproxies",
+			Resource: "observabilitypolicies",
 			Group:    "gateway.nginx.org",
 			Version:  "v1alpha1",
 		},
 		{
-			Resource: "observabilitypolicies",
+			Resource: "snippetsfilters",
+			Group:    "gateway.nginx.org",
+			Version:  "v1alpha1",
+		},
+		{
+			Resource: "upstreamsettingspolicies",
 			Group:    "gateway.nginx.org",
 			Version:  "v1alpha1",
 		},
+		{
+			Resource: "nginxproxies",
+			Group:    "gateway.nginx.org",
+			Version:  "v1alpha2",
+		},
+		{
+			Resource: "observabilitypolicies",
+			Group:    "gateway.nginx.org",
+			Version:  "v1alpha2",
+		},
 	}
 	return crdList
 }

From 984b69e2bb5bb4a7b96b510fd0a46ee4d6fed763 Mon Sep 17 00:00:00 2001
From: Madhu RAJAGOPAL <m.rajagopal@f5.com>
Date: Fri, 28 Nov 2025 17:09:09 +1300
Subject: [PATCH 2/2] Fix: Remove v1alphav1 CRD for observabilitypolicies

---
 pkg/crds/crd.go | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkg/crds/crd.go b/pkg/crds/crd.go
index 8f9826b..35725e9 100644
--- a/pkg/crds/crd.go
+++ b/pkg/crds/crd.go
@@ -97,11 +97,6 @@ func GetNGFCRDList() []Crd {
 			Group:    "gateway.nginx.org",
 			Version:  "v1alpha1",
 		},
-		{
-			Resource: "observabilitypolicies",
-			Group:    "gateway.nginx.org",
-			Version:  "v1alpha1",
-		},
 		{
 			Resource: "snippetsfilters",
 			Group:    "gateway.nginx.org",