From 7f2008369665061c536ab9738d860364c441557b Mon Sep 17 00:00:00 2001 From: Pavel Kratochvil Date: Thu, 21 Jul 2022 12:15:59 +0200 Subject: [PATCH 1/4] Add console capability Signed-off-by: Pavel Kratochvil --- ...uster-version-operator_01_clusterversion.crd.yaml | 3 +++ config/v1/types_cluster_version.go | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) 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 24f379c132c..8df3d921e36 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 @@ -66,6 +66,7 @@ spec: - openshift-samples - baremetal - marketplace + - console 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. @@ -169,6 +170,7 @@ spec: - openshift-samples - baremetal - marketplace + - console x-kubernetes-list-type: atomic knownCapabilities: description: knownCapabilities lists all the capabilities known to the current cluster. @@ -180,6 +182,7 @@ spec: - openshift-samples - baremetal - marketplace + - console 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 95264eec69b..e70990507cf 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 +// +kubebuilder:validation:Enum=openshift-samples;baremetal;marketplace;console type ClusterVersionCapability string const ( @@ -245,11 +245,16 @@ const ( // supplies Operator Lifecycle Manager (OLM) users with default catalogs of // "optional" operators. ClusterVersionCapabilityMarketplace ClusterVersionCapability = "marketplace" + + // ClusterVersionCapabilityConsole manages the Console operator which + // installs and maintains the web console. + ClusterVersionCapabilityConsole ClusterVersionCapability = "console" ) // KnownClusterVersionCapabilities includes all known optional, core cluster components. var KnownClusterVersionCapabilities = []ClusterVersionCapability{ ClusterVersionCapabilityBaremetal, + ClusterVersionCapabilityConsole, ClusterVersionCapabilityMarketplace, ClusterVersionCapabilityOpenShiftSamples, } @@ -279,14 +284,15 @@ const ( var ClusterVersionCapabilitySets = map[ClusterVersionCapabilitySet][]ClusterVersionCapability{ ClusterVersionCapabilitySetNone: {}, ClusterVersionCapabilitySet4_11: { - ClusterVersionCapabilityOpenShiftSamples, ClusterVersionCapabilityBaremetal, ClusterVersionCapabilityMarketplace, + ClusterVersionCapabilityOpenShiftSamples, }, ClusterVersionCapabilitySetCurrent: { - ClusterVersionCapabilityOpenShiftSamples, ClusterVersionCapabilityBaremetal, + ClusterVersionCapabilityConsole, ClusterVersionCapabilityMarketplace, + ClusterVersionCapabilityOpenShiftSamples, }, } From 7395174fe74168e53ed58dfda8c170fbedd6d61d Mon Sep 17 00:00:00 2001 From: Pavel Kratochvil Date: Thu, 21 Jul 2022 12:26:54 +0200 Subject: [PATCH 2/4] Add version entry for v4.12 and its capabilities Signed-off-by: Pavel Kratochvil --- config/v1/types_cluster_version.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/config/v1/types_cluster_version.go b/config/v1/types_cluster_version.go index e70990507cf..ece89becf82 100644 --- a/config/v1/types_cluster_version.go +++ b/config/v1/types_cluster_version.go @@ -260,7 +260,7 @@ var KnownClusterVersionCapabilities = []ClusterVersionCapability{ } // ClusterVersionCapabilitySet defines sets of cluster version capabilities. -// +kubebuilder:validation:Enum=None;v4.11;vCurrent +// +kubebuilder:validation:Enum=None;v4.11;v4.12;vCurrent type ClusterVersionCapabilitySet string const ( @@ -274,6 +274,12 @@ const ( // version of OpenShift is installed. ClusterVersionCapabilitySet4_11 ClusterVersionCapabilitySet = "v4.11" + // ClusterVersionCapabilitySet4_12 is the recommended set of + // optional capabilities to enable for the 4.12 version of + // OpenShift. This list will remain the same no matter which + // version of OpenShift is installed. + ClusterVersionCapabilitySet4_12 ClusterVersionCapabilitySet = "v4.12" + // ClusterVersionCapabilitySetCurrent is the recommended set // of optional capabilities to enable for the cluster's // current version of OpenShift. @@ -288,6 +294,12 @@ var ClusterVersionCapabilitySets = map[ClusterVersionCapabilitySet][]ClusterVers ClusterVersionCapabilityMarketplace, ClusterVersionCapabilityOpenShiftSamples, }, + ClusterVersionCapabilitySet4_12: { + ClusterVersionCapabilityBaremetal, + ClusterVersionCapabilityConsole, + ClusterVersionCapabilityMarketplace, + ClusterVersionCapabilityOpenShiftSamples, + }, ClusterVersionCapabilitySetCurrent: { ClusterVersionCapabilityBaremetal, ClusterVersionCapabilityConsole, From 90677140088d44ad1954fc3a79cc209c2f804036 Mon Sep 17 00:00:00 2001 From: Pavel Kratochvil Date: Tue, 26 Jul 2022 15:57:13 +0200 Subject: [PATCH 3/4] make verify Signed-off-by: Pavel Kratochvil --- .../0000_00_cluster-version-operator_01_clusterversion.crd.yaml | 1 + 1 file changed, 1 insertion(+) 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 8df3d921e36..20f2c021916 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 @@ -74,6 +74,7 @@ spec: enum: - None - v4.11 + - v4.12 - 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. From 1c3504d262e893fb31b92a5c036b31ed92760bb5 Mon Sep 17 00:00:00 2001 From: Pavel Kratochvil Date: Thu, 28 Jul 2022 10:36:55 +0200 Subject: [PATCH 4/4] Add console capability annotation to CRDs Signed-off-by: Pavel Kratochvil --- console/v1/0000_10_consoleclidownload.crd.yaml | 1 + console/v1/0000_10_consoleexternalloglink.crd.yaml | 1 + console/v1/0000_10_consolelink.crd.yaml | 1 + console/v1/0000_10_consolenotification.crd.yaml | 1 + console/v1/0000_10_consolequickstart.crd.yaml | 1 + console/v1/0000_10_consoleyamlsample.crd.yaml | 1 + console/v1alpha1/0000_10_consoleplugin.crd.yaml | 1 + 7 files changed, 7 insertions(+) diff --git a/console/v1/0000_10_consoleclidownload.crd.yaml b/console/v1/0000_10_consoleclidownload.crd.yaml index be850f459b7..a2857bc199a 100644 --- a/console/v1/0000_10_consoleclidownload.crd.yaml +++ b/console/v1/0000_10_consoleclidownload.crd.yaml @@ -8,6 +8,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: console name: consoleclidownloads.console.openshift.io spec: group: console.openshift.io diff --git a/console/v1/0000_10_consoleexternalloglink.crd.yaml b/console/v1/0000_10_consoleexternalloglink.crd.yaml index 29481e1ea29..dd287f4555c 100644 --- a/console/v1/0000_10_consoleexternalloglink.crd.yaml +++ b/console/v1/0000_10_consoleexternalloglink.crd.yaml @@ -8,6 +8,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: console name: consoleexternalloglinks.console.openshift.io spec: group: console.openshift.io diff --git a/console/v1/0000_10_consolelink.crd.yaml b/console/v1/0000_10_consolelink.crd.yaml index a8f1617d452..eeef210d618 100644 --- a/console/v1/0000_10_consolelink.crd.yaml +++ b/console/v1/0000_10_consolelink.crd.yaml @@ -8,6 +8,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: console name: consolelinks.console.openshift.io spec: group: console.openshift.io diff --git a/console/v1/0000_10_consolenotification.crd.yaml b/console/v1/0000_10_consolenotification.crd.yaml index 8955b6ba959..0b6df5e2279 100644 --- a/console/v1/0000_10_consolenotification.crd.yaml +++ b/console/v1/0000_10_consolenotification.crd.yaml @@ -8,6 +8,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: console name: consolenotifications.console.openshift.io spec: group: console.openshift.io diff --git a/console/v1/0000_10_consolequickstart.crd.yaml b/console/v1/0000_10_consolequickstart.crd.yaml index a6a477c45b7..b67c6ce8b2b 100644 --- a/console/v1/0000_10_consolequickstart.crd.yaml +++ b/console/v1/0000_10_consolequickstart.crd.yaml @@ -8,6 +8,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: console name: consolequickstarts.console.openshift.io spec: group: console.openshift.io diff --git a/console/v1/0000_10_consoleyamlsample.crd.yaml b/console/v1/0000_10_consoleyamlsample.crd.yaml index 1312e98e229..d936d8fe595 100644 --- a/console/v1/0000_10_consoleyamlsample.crd.yaml +++ b/console/v1/0000_10_consoleyamlsample.crd.yaml @@ -8,6 +8,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: console name: consoleyamlsamples.console.openshift.io spec: group: console.openshift.io diff --git a/console/v1alpha1/0000_10_consoleplugin.crd.yaml b/console/v1alpha1/0000_10_consoleplugin.crd.yaml index 370e9a426e2..8a0bdb48e79 100644 --- a/console/v1alpha1/0000_10_consoleplugin.crd.yaml +++ b/console/v1alpha1/0000_10_consoleplugin.crd.yaml @@ -8,6 +8,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: console name: consoleplugins.console.openshift.io spec: group: console.openshift.io