Merge pull request #28057 from jerolimov/ODC-7333

ODC-7333: Add consolesamples to the exception list of CRDs without a status
openshift · Jul 17, 2023 · f907888 · f907888
2 parents 9609ce2 + 277ddd3
commit f907888
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/test/extended/cli/explain.go b/test/extended/cli/explain.go
@@ -411,18 +411,23 @@ var (
 				pattern: `DESCRIPTION\:.*`,
 			},
 			{
-				gv:      schema.GroupVersion{Group: "console.openshift.io", Version: "v1alpha1"},
+				gv:      schema.GroupVersion{Group: "console.openshift.io", Version: "v1"},
 				field:   "consoleplugins.spec",
 				pattern: `DESCRIPTION\:.*`,
 			},
 			{
 				gv:      schema.GroupVersion{Group: "console.openshift.io", Version: "v1"},
-				field:   "consoleyamlsamples.spec",
+				field:   "consolequickstarts.spec",
 				pattern: `DESCRIPTION\:.*`,
 			},
 			{
 				gv:      schema.GroupVersion{Group: "console.openshift.io", Version: "v1"},
-				field:   "consolequickstarts.spec",
+				field:   "consolesamples.spec",
+				pattern: `DESCRIPTION\:.*`,
+			},
+			{
+				gv:      schema.GroupVersion{Group: "console.openshift.io", Version: "v1"},
+				field:   "consoleyamlsamples.spec",
 				pattern: `DESCRIPTION\:.*`,
 			},
 		},

diff --git a/test/extended/operators/check_crd_status.go b/test/extended/operators/check_crd_status.go
@@ -90,6 +90,7 @@ func checkStatusInSchema(crdItemList []apiextensionsv1.CustomResourceDefinition)
 		"consolenotifications.console.openshift.io",
 		"consoleplugins.console.openshift.io",
 		"consolequickstarts.console.openshift.io",
+		"consolesamples.console.openshift.io",
 		"consoleyamlsamples.console.openshift.io",
 		"egressnetworkpolicies.network.openshift.io",
 		"hostsubnets.network.openshift.io",