From 5933a6b3565760d16df7ff4e41d39c98244239d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20L=C3=BCders?= Date: Tue, 28 Jun 2022 16:06:40 +0200 Subject: [PATCH] config/v1/types_cluster_version: Add insights Add insights operator as a capability config/v1/types_cluster_version: version cap 4.12 - Adds the version capability set 4.12 - Moves insights cabability to version 4.12 config/v1/types_cluster_version: adds insights cap to current add capability set to cvo config crd update cvo cr manifest rename insights to Insights --- ...cluster-version-operator_01_clusterversion.crd.yaml | 3 +++ config/v1/types_cluster_version.go | 10 +++++++++- 2 files changed, 12 insertions(+), 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 index 52f3f2b403d..c5487452cca 100644 --- a/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml +++ b/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml @@ -67,6 +67,7 @@ spec: - baremetal - marketplace - Console + - Insights 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. @@ -172,6 +173,7 @@ spec: - baremetal - marketplace - Console + - Insights x-kubernetes-list-type: atomic knownCapabilities: description: knownCapabilities lists all the capabilities known to the current cluster. @@ -184,6 +186,7 @@ spec: - baremetal - marketplace - Console + - Insights 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/types_cluster_version.go b/config/v1/types_cluster_version.go index 90a37afa568..4ab58b19300 100644 --- 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;marketplace;Console +// +kubebuilder:validation:Enum=openshift-samples;baremetal;marketplace;Console;Insights type ClusterVersionCapability string const ( @@ -249,12 +249,18 @@ const ( // ClusterVersionCapabilityConsole manages the Console operator which // installs and maintains the web console. ClusterVersionCapabilityConsole ClusterVersionCapability = "Console" + + // ClusterVersionCapabilityInsights manages the Insights operator which + // collects anonymized information about the cluster to generate + // recommendations for possible cluster issues. + ClusterVersionCapabilityInsights ClusterVersionCapability = "Insights" ) // KnownClusterVersionCapabilities includes all known optional, core cluster components. var KnownClusterVersionCapabilities = []ClusterVersionCapability{ ClusterVersionCapabilityBaremetal, ClusterVersionCapabilityConsole, + ClusterVersionCapabilityInsights, ClusterVersionCapabilityMarketplace, ClusterVersionCapabilityOpenShiftSamples, } @@ -297,12 +303,14 @@ var ClusterVersionCapabilitySets = map[ClusterVersionCapabilitySet][]ClusterVers ClusterVersionCapabilitySet4_12: { ClusterVersionCapabilityBaremetal, ClusterVersionCapabilityConsole, + ClusterVersionCapabilityInsights, ClusterVersionCapabilityMarketplace, ClusterVersionCapabilityOpenShiftSamples, }, ClusterVersionCapabilitySetCurrent: { ClusterVersionCapabilityBaremetal, ClusterVersionCapabilityConsole, + ClusterVersionCapabilityInsights, ClusterVersionCapabilityMarketplace, ClusterVersionCapabilityOpenShiftSamples, },