Merge pull request #28302 from eggfoobar/add-optional-olm-fixes

OCPVE-723: Add optional olm fixes

Author: openshift-ci[bot]

go.mod

@@ -22,7 +22,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.9.2
 	github.com/onsi/gomega v1.27.6
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/openshift/api v0.0.0-20230915112357-693d4b64813c
+	github.com/openshift/api v0.0.0-20231003083825-c3f7566f6ef6
 	github.com/openshift/apiserver-library-go v0.0.0-20230915134751-5c71e94d6f05
 	github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d
 	github.com/openshift/client-go v0.0.0-20230915115245-53bd8980dfb7

go.sum

@@ -641,8 +641,8 @@ github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 h1:R
 github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/selinux v1.10.0 h1:rAiKF8hTcgLI3w0DHm6i0ylVVcOrlgR1kK99DRLDhyU=
 github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
-github.com/openshift/api v0.0.0-20230915112357-693d4b64813c h1:ro/BvvpAikMoZc/fsxJN6jxmK+4uIbdNIK9nwaFQ5xo=
-github.com/openshift/api v0.0.0-20230915112357-693d4b64813c/go.mod h1:NFgA+laiQtptmjsp1trDnGqjV62nYzlUfQ6P5I9oqXA=
+github.com/openshift/api v0.0.0-20231003083825-c3f7566f6ef6 h1:dLPcRvLeZs3ATgXCVrU/ZEVssHO5636sodMdJVAPPUQ=
+github.com/openshift/api v0.0.0-20231003083825-c3f7566f6ef6/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU=
 github.com/openshift/apiserver-library-go v0.0.0-20230915134751-5c71e94d6f05 h1:FuFc6HV3MuhxAGcslIkLOXhOjvBjioloKbSD3cWMzeo=
 github.com/openshift/apiserver-library-go v0.0.0-20230915134751-5c71e94d6f05/go.mod h1:x2CP20tBy7PnNCy0N6LxwnNHwsiPBlmAqG4xemgemZ8=
 github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d h1:RR4ah7FfaPR1WePizm0jlrsbmPu91xQZnAsVVreQV1k=

test/extended/cli/explain.go

@@ -91,21 +91,6 @@ var (
 		{Group: "monitoring.coreos.com", Version: "v1", Resource: "servicemonitors"},
 		{Group: "monitoring.coreos.com", Version: "v1", Resource: "thanosrulers"},
 
-		{Group: "operators.coreos.com", Version: "v1", Resource: "olmconfigs"},
-		{Group: "operators.coreos.com", Version: "v1", Resource: "operators"},
-		{Group: "operators.coreos.com", Version: "v1", Resource: "operatorconditions"},
-		{Group: "operators.coreos.com", Version: "v1", Resource: "operatorgroups"},
-
-		{Group: "operators.coreos.com", Version: "v2", Resource: "operatorconditions"},
-
-		{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "catalogsources"},
-		{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "clusterserviceversions"},
-		{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "installplans"},
-		{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "subscriptions"},
-		{Group: "operators.coreos.com", Version: "v1alpha2", Resource: "operatorgroups"},
-
-		{Group: "packages.operators.coreos.com", Version: "v1", Resource: "packagemanifests"},
-
 		// openshift.io groups:
 
 		{Group: "apiserver.openshift.io", Version: "v1", Resource: "apirequestcounts"},
@@ -165,6 +150,24 @@ var (
 
 		{Group: "samples.operator.openshift.io", Version: "v1", Resource: "configs"},
 	}
+
+	olmTypes = []schema.GroupVersionResource{
+		{Group: "operators.coreos.com", Version: "v1", Resource: "olmconfigs"},
+		{Group: "operators.coreos.com", Version: "v1", Resource: "operators"},
+		{Group: "operators.coreos.com", Version: "v1", Resource: "operatorconditions"},
+		{Group: "operators.coreos.com", Version: "v1", Resource: "operatorgroups"},
+
+		{Group: "operators.coreos.com", Version: "v2", Resource: "operatorconditions"},
+
+		{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "catalogsources"},
+		{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "clusterserviceversions"},
+		{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "installplans"},
+		{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "subscriptions"},
+		{Group: "operators.coreos.com", Version: "v1alpha2", Resource: "operatorgroups"},
+
+		{Group: "packages.operators.coreos.com", Version: "v1", Resource: "packagemanifests"},
+	}
+
 	mcoTypes = []schema.GroupVersionResource{
 		{Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "containerruntimeconfigs"},
 		{Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "controllerconfigs"},
@@ -517,6 +520,8 @@ func getCrdTypes(oc *exutil.CLI) []schema.GroupVersionResource {
 				crdTypes = append(crdTypes, metal3Types...)
 			case configv1.ClusterVersionCapabilityNodeTuning:
 				crdTypes = append(crdTypes, nodeTuningTypes...)
+			case configv1.ClusterVersionCapabilityOperatorLifecycleManager:
+				crdTypes = append(crdTypes, olmTypes...)
 			}
 		}
 	}

test/extended/util/annotate/generated/zz_generated.annotations.go

@@ -240,6 +240,13 @@ var (
 			// Requires ImageRegistry service to be active for OCM to be able to create pull secrets
 			`\[sig-devex\]\[Feature:OpenShiftControllerManager\] TestAutomaticCreationOfPullSecrets \[apigroup:config.openshift.io\]`,
 			`\[sig-devex\]\[Feature:OpenShiftControllerManager\] TestDockercfgTokenDeletedController \[apigroup:image.openshift.io\]`,
+
+			// These tests run against OLM which does not exist when the optional OLM capability is disabled.
+			`\[sig-operator\] OLM should Implement packages API server and list packagemanifest info with namespace not NULL`,
+			`\[sig-operator\] OLM should be installed with`,
+			`\[sig-operator\] OLM should have imagePullPolicy:IfNotPresent on thier deployments`,
+			`\[sig-operator\] an end user can use OLM`,
+			`\[sig-arch\] ocp payload should be based on existing source OLM`,
 		},
 	}
 )