config/v1/types_cluster_version: Add capabilties properties

config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml

@@ -52,6 +52,26 @@ spec:
               required:
                 - clusterID
               properties:
+                capabilities:
+                  description: capabilities configures the installation of optional, core cluster components.  A null value here is identical to an empty object; see the child properties for default semantics.
+                  type: object
+                  properties:
+                    additionalEnabledCapabilities:
+                      description: additionalEnabledCapabilities extends the set of managed capabilities beyond the baseline defined in baselineCapabilitySet.  The default is an empty set.
+                      type: array
+                      items:
+                        description: ClusterVersionCapability enumerates optional, core cluster components.
+                        type: string
+                        enum:
+                          - openshift-samples
+                      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.
+                      type: string
+                      enum:
+                        - None
+                        - v4.11
+                        - vCurrent
                 channel:
                   description: channel is an identifier for explicitly requesting that a non-default set of updates be applied to this cluster. The default channel will be contain stable updates that are appropriate for production clusters.
                   type: string
@@ -133,6 +153,28 @@ spec:
                         description: version is a semantic versioning identifying the update version. When this field is part of spec, version is optional if image is specified.
                         type: string
                   nullable: true
+                capabilities:
+                  description: capabilities describes the state of optional, core cluster components.
+                  type: object
+                  properties:
+                    enabledCapabilities:
+                      description: enabledCapabilities lists all the capabilities that are currently managed.
+                      type: array
+                      items:
+                        description: ClusterVersionCapability enumerates optional, core cluster components.
+                        type: string
+                        enum:
+                          - openshift-samples
+                      x-kubernetes-list-type: atomic
+                    knownCapabilities:
+                      description: knownCapabilities lists all the capabilities known to the current cluster.
+                      type: array
+                      items:
+                        description: ClusterVersionCapability enumerates optional, core cluster components.
+                        type: string
+                        enum:
+                          - openshift-samples
+                      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.
                   type: array

config/v1/types_cluster_version.go

@@ -68,6 +68,12 @@ type ClusterVersionSpec struct {
 	// +optional
 	Channel string `json:"channel,omitempty"`
 
+	// capabilities configures the installation of optional, core
+	// cluster components.  A null value here is identical to an
+	// empty object; see the child properties for default semantics.
+	// +optional
+	Capabilities *ClusterVersionCapabilitiesSpec `json:"capabilities,omitempty"`
+
 	// overrides is list of overides for components that are managed by
 	// cluster version operator. Marking a component unmanaged will prevent
 	// the operator from creating or updating the object.
@@ -113,6 +119,9 @@ type ClusterVersionStatus struct {
 	// +required
 	VersionHash string `json:"versionHash"`
 
+	// capabilities describes the state of optional, core cluster components.
+	Capabilities ClusterVersionCapabilitiesStatus `json:"capabilities"`
+
 	// conditions provides information about the cluster version. The condition
 	// "Available" is set to true if the desiredUpdate has been reached. The
 	// condition "Progressing" is set to true if an update is being applied.
@@ -215,6 +224,86 @@ type UpdateHistory struct {
 // ClusterID is string RFC4122 uuid.
 type ClusterID string
 
+// ClusterVersionCapability enumerates optional, core cluster components.
+// +kubebuilder:validation:Enum=openshift-samples
+type ClusterVersionCapability string
+
+const (
+	// ClusterVersionCapabilityOpenShiftSamples manages the sample
+	// image streams and templates stored in the openshift
+	// namespace, and any registry credentials, stored as a secret,
+	// needed for the image streams to import the images they
+	// reference.
+	ClusterVersionCapabilityOpenShiftSamples ClusterVersionCapability = "openshift-samples"
+)
+
+// ClusterVersionCapabilitySet defines sets of cluster version capabilities.
+// +kubebuilder:validation:Enum=None;v4.11;vCurrent
+type ClusterVersionCapabilitySet string
+
+const (
+	// ClusterVersionCapabilitySetNone is an empty set enabling
+	// no optional capabilities.
+	ClusterVersionCapabilitySetNone ClusterVersionCapabilitySet = "None"
+
+	// ClusterVersionCapabilitySet4_11 is the recommended set of
+	// optional capabilities to enable for the 4.11 version of
+	// OpenShift.  This list will remain the same no matter which
+	// version of OpenShift is installed.
+	ClusterVersionCapabilitySet4_11 ClusterVersionCapabilitySet = "v4.11"
+
+	// ClusterVersionCapabilitySetCurrent is the recommended set
+	// of optional capabilities to enable for the cluster's
+	// current version of OpenShift.
+	ClusterVersionCapabilitySetCurrent ClusterVersionCapabilitySet = "vCurrent"
+)
+
+// ClusterVersionCapabilitySets defines sets of cluster version capabilities.
+var ClusterVersionCapabilitySets = map[ClusterVersionCapabilitySet][]ClusterVersionCapability{
+	ClusterVersionCapabilitySetNone: {},
+	ClusterVersionCapabilitySet4_11: {
+		ClusterVersionCapabilityOpenShiftSamples,
+	},
+	ClusterVersionCapabilitySetCurrent: {
+		ClusterVersionCapabilityOpenShiftSamples,
+	},
+}
+
+// ClusterVersionCapabilitiesSpec selects the managed set of
+// optional, core cluster components.
+// +k8s:deepcopy-gen=true
+type ClusterVersionCapabilitiesSpec struct {
+	// 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.
+	// +optional
+	BaselineCapabilitySet ClusterVersionCapabilitySet `json:"baselineCapabilitySet,omitempty"`
+
+	// additionalEnabledCapabilities extends the set of managed
+	// capabilities beyond the baseline defined in
+	// baselineCapabilitySet.  The default is an empty set.
+	// +listType=atomic
+	// +optional
+	AdditionalEnabledCapabilities []ClusterVersionCapability `json:"additionalEnabledCapabilities,omitempty"`
+}
+
+// ClusterVersionCapabilitiesStatus describes the state of optional,
+// core cluster components.
+// +k8s:deepcopy-gen=true
+type ClusterVersionCapabilitiesStatus struct {
+	// enabledCapabilities lists all the capabilities that are currently managed.
+	// +listType=atomic
+	// +optional
+	EnabledCapabilities []ClusterVersionCapability `json:"enabledCapabilities,omitempty"`
+
+	// knownCapabilities lists all the capabilities known to the current cluster.
+	// +listType=atomic
+	// +optional
+	KnownCapabilities []ClusterVersionCapability `json:"knownCapabilities,omitempty"`
+}
+
 // ComponentOverride allows overriding cluster version operator's behavior
 // for a component.
 // +k8s:deepcopy-gen=true