Merge pull request #1150 from njhale/marketplace-capability

config/v1/types_cluster_version: add marketplace capability
openshift · Mar 25, 2022 · 8107b7a · 8107b7a
2 parents 647022c + 946f9b4
commit 8107b7a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml b/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml
@@ -65,6 +65,7 @@ spec:
                         enum:
                           - openshift-samples
                           - baremetal
+                          - marketplace
                       x-kubernetes-list-type: atomic
                     baselineCapabilitySet:
                       description: baselineCapabilitySet selects an initial set of optional capabilities to enable, which can be extended via additionalEnabledCapabilities.  If unset, the cluster will choose a default, and the default may change over time. The current default is vCurrent.
@@ -167,6 +168,7 @@ spec:
                         enum:
                           - openshift-samples
                           - baremetal
+                          - marketplace
                       x-kubernetes-list-type: atomic
                     knownCapabilities:
                       description: knownCapabilities lists all the capabilities known to the current cluster.
@@ -177,6 +179,7 @@ spec:
                         enum:
                           - openshift-samples
                           - baremetal
+                          - marketplace
                       x-kubernetes-list-type: atomic
                 conditionalUpdates:
                   description: conditionalUpdates contains the list of updates that may be recommended for this cluster if it meets specific required conditions. Consumers interested in the set of updates that are actually recommended for this cluster should use availableUpdates. This list may be empty if no updates are recommended, if the update service is unavailable, or if an empty or invalid channel has been specified.

diff --git a/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml b/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml
@@ -6,6 +6,7 @@ metadata:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
+    capability.openshift.io/name: "marketplace"
   name: operatorhubs.config.openshift.io
 spec:
   group: config.openshift.io

diff --git a/config/v1/types_cluster_version.go b/config/v1/types_cluster_version.go
@@ -225,7 +225,7 @@ type UpdateHistory struct {
 type ClusterID string
 
 // ClusterVersionCapability enumerates optional, core cluster components.
-// +kubebuilder:validation:Enum=openshift-samples;baremetal
+// +kubebuilder:validation:Enum=openshift-samples;baremetal;marketplace
 type ClusterVersionCapability string
 
 const (
@@ -240,6 +240,11 @@ const (
 	// baremetal operator which is responsible for running the metal3
 	// deployment.
 	ClusterVersionCapabilityBaremetal ClusterVersionCapability = "baremetal"
+
+	// ClusterVersionCapabilityMarketplace manages the Marketplace operator which
+	// supplies Operator Lifecycle Manager (OLM) users with default catalogs of
+	// "optional" operators.
+	ClusterVersionCapabilityMarketplace ClusterVersionCapability = "marketplace"
 )
 
 // ClusterVersionCapabilitySet defines sets of cluster version capabilities.
@@ -269,10 +274,12 @@ var ClusterVersionCapabilitySets = map[ClusterVersionCapabilitySet][]ClusterVers
 	ClusterVersionCapabilitySet4_11: {
 		ClusterVersionCapabilityOpenShiftSamples,
 		ClusterVersionCapabilityBaremetal,
+		ClusterVersionCapabilityMarketplace,
 	},
 	ClusterVersionCapabilitySetCurrent: {
 		ClusterVersionCapabilityOpenShiftSamples,
 		ClusterVersionCapabilityBaremetal,
+		ClusterVersionCapabilityMarketplace,
 	},
 }