diff --git a/api/hypershift/v1beta1/hostedcluster_types.go b/api/hypershift/v1beta1/hostedcluster_types.go
index 01faa1e48c3..0ebeea79e75 100644
--- a/api/hypershift/v1beta1/hostedcluster_types.go
+++ b/api/hypershift/v1beta1/hostedcluster_types.go
@@ -379,13 +379,14 @@ const (
PruneRetentionPolicy RetentionPolicy = "Prune"
)
-// +kubebuilder:validation:Enum=ImageRegistry;openshift-samples;Insights;baremetal
+// +kubebuilder:validation:Enum=ImageRegistry;openshift-samples;Insights;baremetal;Console
type OptionalCapability string
const ImageRegistryCapability OptionalCapability = OptionalCapability(configv1.ClusterVersionCapabilityImageRegistry)
const OpenShiftSamplesCapability OptionalCapability = OptionalCapability(configv1.ClusterVersionCapabilityOpenShiftSamples)
const InsightsCapability OptionalCapability = OptionalCapability(configv1.ClusterVersionCapabilityInsights)
const BaremetalCapability OptionalCapability = OptionalCapability(configv1.ClusterVersionCapabilityBaremetal)
+const ConsoleCapability OptionalCapability = OptionalCapability(configv1.ClusterVersionCapabilityConsole)
// capabilities allows enabling or disabling optional components at install time.
// When this is not supplied, the cluster will use the DefaultCapabilitySet defined for the respective
@@ -407,7 +408,7 @@ type Capabilities struct {
// disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
// Once set, this field cannot be changed.
//
- // Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ // Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
//
// +listType=atomic
// +immutable
diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/AAA_ungated.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/AAA_ungated.yaml
index db99e00b2b8..949b6cc6ac2 100644
--- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/AAA_ungated.yaml
+++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/AAA_ungated.yaml
@@ -161,13 +161,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -186,6 +187,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/AutoNodeKarpenter.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/AutoNodeKarpenter.yaml
index 0037372ecb0..66f8e4fc27c 100644
--- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/AutoNodeKarpenter.yaml
+++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/AutoNodeKarpenter.yaml
@@ -208,13 +208,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -233,6 +234,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ClusterVersionOperatorConfiguration.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ClusterVersionOperatorConfiguration.yaml
index f17c44a4de4..5381be2d155 100644
--- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ClusterVersionOperatorConfiguration.yaml
+++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ClusterVersionOperatorConfiguration.yaml
@@ -161,13 +161,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -186,6 +187,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/DynamicResourceAllocation.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/DynamicResourceAllocation.yaml
index 59962ece97d..dcc4d552389 100644
--- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/DynamicResourceAllocation.yaml
+++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/DynamicResourceAllocation.yaml
@@ -161,13 +161,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -186,6 +187,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ExternalOIDC.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ExternalOIDC.yaml
index 8d8aa83ca9d..53a2505efc1 100644
--- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ExternalOIDC.yaml
+++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ExternalOIDC.yaml
@@ -161,13 +161,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -186,6 +187,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ExternalOIDCWithUIDAndExtraClaimMappings.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ExternalOIDCWithUIDAndExtraClaimMappings.yaml
index 2ebbce9dfd7..5677d995c6e 100644
--- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ExternalOIDCWithUIDAndExtraClaimMappings.yaml
+++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ExternalOIDCWithUIDAndExtraClaimMappings.yaml
@@ -161,13 +161,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -186,6 +187,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ImageStreamImportMode.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ImageStreamImportMode.yaml
index 00eee4d041b..8467087bf25 100644
--- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ImageStreamImportMode.yaml
+++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ImageStreamImportMode.yaml
@@ -161,13 +161,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -186,6 +187,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/KMSEncryptionProvider.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/KMSEncryptionProvider.yaml
index d3204e600ac..3715e3f815f 100644
--- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/KMSEncryptionProvider.yaml
+++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/KMSEncryptionProvider.yaml
@@ -161,13 +161,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -186,6 +187,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/NetworkDiagnosticsConfig.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/NetworkDiagnosticsConfig.yaml
index f2b83ad975b..7706f241c73 100644
--- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/NetworkDiagnosticsConfig.yaml
+++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/NetworkDiagnosticsConfig.yaml
@@ -161,13 +161,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -186,6 +187,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/OpenStack.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/OpenStack.yaml
index 5c134758b8d..8721f9dfb7e 100644
--- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/OpenStack.yaml
+++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/OpenStack.yaml
@@ -161,13 +161,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -186,6 +187,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/AAA_ungated.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/AAA_ungated.yaml
index cd529e5b12d..6f012d5ae92 100644
--- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/AAA_ungated.yaml
+++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/AAA_ungated.yaml
@@ -129,13 +129,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -154,6 +155,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/AutoNodeKarpenter.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/AutoNodeKarpenter.yaml
index edde063664a..6e8a1e51a7d 100644
--- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/AutoNodeKarpenter.yaml
+++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/AutoNodeKarpenter.yaml
@@ -176,13 +176,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -201,6 +202,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ClusterVersionOperatorConfiguration.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ClusterVersionOperatorConfiguration.yaml
index 8d14e7a3961..6a4641e4b20 100644
--- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ClusterVersionOperatorConfiguration.yaml
+++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ClusterVersionOperatorConfiguration.yaml
@@ -129,13 +129,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -154,6 +155,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/DynamicResourceAllocation.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/DynamicResourceAllocation.yaml
index 0ad42741295..c4a5f224c5e 100644
--- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/DynamicResourceAllocation.yaml
+++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/DynamicResourceAllocation.yaml
@@ -129,13 +129,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -154,6 +155,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ExternalOIDC.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ExternalOIDC.yaml
index 524f966cd2b..c3e80fa465c 100644
--- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ExternalOIDC.yaml
+++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ExternalOIDC.yaml
@@ -129,13 +129,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -154,6 +155,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ExternalOIDCWithUIDAndExtraClaimMappings.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ExternalOIDCWithUIDAndExtraClaimMappings.yaml
index aa5721cba01..b340676989a 100644
--- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ExternalOIDCWithUIDAndExtraClaimMappings.yaml
+++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ExternalOIDCWithUIDAndExtraClaimMappings.yaml
@@ -129,13 +129,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -154,6 +155,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ImageStreamImportMode.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ImageStreamImportMode.yaml
index 2e9ee2abf5a..f67fe4a3a2b 100644
--- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ImageStreamImportMode.yaml
+++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ImageStreamImportMode.yaml
@@ -129,13 +129,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -154,6 +155,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/KMSEncryptionProvider.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/KMSEncryptionProvider.yaml
index 4050a106bcc..136874c80b0 100644
--- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/KMSEncryptionProvider.yaml
+++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/KMSEncryptionProvider.yaml
@@ -129,13 +129,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -154,6 +155,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/NetworkDiagnosticsConfig.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/NetworkDiagnosticsConfig.yaml
index 7f29ea761ba..b7f5c75f506 100644
--- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/NetworkDiagnosticsConfig.yaml
+++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/NetworkDiagnosticsConfig.yaml
@@ -129,13 +129,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -154,6 +155,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/OpenStack.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/OpenStack.yaml
index 2b788d9b792..f39423aa4d0 100644
--- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/OpenStack.yaml
+++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/OpenStack.yaml
@@ -129,13 +129,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -154,6 +155,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/cmd/cluster/core/create.go b/cmd/cluster/core/create.go
index 6924c73ae54..8ca51405890 100644
--- a/cmd/cluster/core/create.go
+++ b/cmd/cluster/core/create.go
@@ -108,7 +108,7 @@ func bindCoreOptions(opts *RawCreateOptions, flags *pflag.FlagSet) {
flags.StringVar(&opts.PausedUntil, "pausedUntil", opts.PausedUntil, "If a date is provided in RFC3339 format, HostedCluster creation is paused until that date. If the boolean true is provided, HostedCluster creation is paused until the field is removed.")
flags.StringVar(&opts.ReleaseStream, "release-stream", opts.ReleaseStream, "The OCP release stream for the cluster (e.g. 4-stable-multi), this flag is ignored if release-image is set")
flags.StringVar(&opts.FeatureSet, "feature-set", opts.FeatureSet, "The predefined feature set to use for the cluster (TechPreviewNoUpgrade or DevPreviewNoUpgrade)")
- flags.StringSliceVar(&opts.DisableClusterCapabilities, "disable-cluster-capabilities", nil, "Optional cluster capabilities to disable. The only currently supported values are ImageRegistry,openshift-samples,Insights,baremetal.")
+ flags.StringSliceVar(&opts.DisableClusterCapabilities, "disable-cluster-capabilities", nil, "Optional cluster capabilities to disable. The only currently supported values are ImageRegistry,openshift-samples,Insights,baremetal,Console.")
flags.StringSliceVar(&opts.EnableClusterCapabilities, "enable-cluster-capabilities", nil, "Optional cluster capabilities to enable. The only currently supported values are ImageRegistry,openshift-samples,Insights,baremetal.")
flags.StringVar(&opts.KubeAPIServerDNSName, "kas-dns-name", opts.KubeAPIServerDNSName, "The custom DNS name for the kube-apiserver service. Make sure the DNS name is valid and addressable.")
}
@@ -712,6 +712,7 @@ func (opts *RawCreateOptions) Validate(ctx context.Context) (*ValidatedCreateOpt
string(hyperv1.OpenShiftSamplesCapability),
string(hyperv1.InsightsCapability),
string(hyperv1.BaremetalCapability),
+ string(hyperv1.ConsoleCapability),
)
if len(opts.DisableClusterCapabilities) > 0 {
for _, capability := range opts.DisableClusterCapabilities {
diff --git a/cmd/cluster/core/create_test.go b/cmd/cluster/core/create_test.go
index 64534fafd2b..ca344685151 100644
--- a/cmd/cluster/core/create_test.go
+++ b/cmd/cluster/core/create_test.go
@@ -254,6 +254,17 @@ func TestValidate(t *testing.T) {
},
expectedErr: "",
},
+ {
+ name: "passes with Console capability",
+ rawOpts: &RawCreateOptions{
+ Name: "test-hc",
+ Namespace: "test-hc",
+ PullSecretFile: pullSecretFile,
+ Arch: "amd64",
+ DisableClusterCapabilities: []string{"Console"},
+ },
+ expectedErr: "",
+ },
{
name: "fails with an invalid DNS name as KubeAPIServerDNSName",
rawOpts: &RawCreateOptions{
diff --git a/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedclusters-CustomNoUpgrade.crd.yaml b/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedclusters-CustomNoUpgrade.crd.yaml
index 08a042076c0..3ddbb8a9cd7 100644
--- a/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedclusters-CustomNoUpgrade.crd.yaml
+++ b/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedclusters-CustomNoUpgrade.crd.yaml
@@ -211,13 +211,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -236,6 +237,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedclusters-Default.crd.yaml b/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedclusters-Default.crd.yaml
index 707a17ae4eb..b20c52ad2a4 100644
--- a/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedclusters-Default.crd.yaml
+++ b/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedclusters-Default.crd.yaml
@@ -164,13 +164,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -189,6 +190,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedclusters-TechPreviewNoUpgrade.crd.yaml b/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedclusters-TechPreviewNoUpgrade.crd.yaml
index dc6060e72de..ec095213c9d 100644
--- a/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedclusters-TechPreviewNoUpgrade.crd.yaml
+++ b/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedclusters-TechPreviewNoUpgrade.crd.yaml
@@ -211,13 +211,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -236,6 +237,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-CustomNoUpgrade.crd.yaml b/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-CustomNoUpgrade.crd.yaml
index fb16870b999..4370ddb0eee 100644
--- a/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-CustomNoUpgrade.crd.yaml
+++ b/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-CustomNoUpgrade.crd.yaml
@@ -179,13 +179,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -204,6 +205,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-Default.crd.yaml b/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-Default.crd.yaml
index ce39305f46b..7eaf83551f6 100644
--- a/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-Default.crd.yaml
+++ b/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-Default.crd.yaml
@@ -132,13 +132,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -157,6 +158,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-TechPreviewNoUpgrade.crd.yaml b/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-TechPreviewNoUpgrade.crd.yaml
index 5a2d1cfd770..8bd9dd2a97a 100644
--- a/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-TechPreviewNoUpgrade.crd.yaml
+++ b/cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-TechPreviewNoUpgrade.crd.yaml
@@ -179,13 +179,14 @@ spec:
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
- Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
items:
enum:
- ImageRegistry
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
@@ -204,6 +205,7 @@ spec:
- openshift-samples
- Insights
- baremetal
+ - Console
type: string
maxItems: 25
type: array
diff --git a/control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources_test.go b/control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources_test.go
index 57033e624cd..3f7bd0fcce3 100644
--- a/control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources_test.go
+++ b/control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources_test.go
@@ -985,7 +985,7 @@ func TestReconcileClusterVersionWithDisabledCapabilities(t *testing.T) {
ClusterID: "test-cluster-id",
Capabilities: &hyperv1.Capabilities{
Disabled: []hyperv1.OptionalCapability{
- hyperv1.ImageRegistryCapability, hyperv1.OpenShiftSamplesCapability, hyperv1.InsightsCapability,
+ hyperv1.ImageRegistryCapability, hyperv1.OpenShiftSamplesCapability, hyperv1.InsightsCapability, hyperv1.ConsoleCapability,
},
},
},
@@ -1039,7 +1039,7 @@ func TestReconcileClusterVersionWithDisabledCapabilities(t *testing.T) {
configv1.ClusterVersionCapabilityCSISnapshot,
configv1.ClusterVersionCapabilityCloudControllerManager,
configv1.ClusterVersionCapabilityCloudCredential,
- configv1.ClusterVersionCapabilityConsole,
+ //configv1.ClusterVersionCapabilityConsole,
configv1.ClusterVersionCapabilityDeploymentConfig,
// configv1.ClusterVersionCapabilityImageRegistry,
configv1.ClusterVersionCapabilityIngress,
diff --git a/docs/content/reference/api.md b/docs/content/reference/api.md
index 3a582481a06..974dbac66d1 100644
--- a/docs/content/reference/api.md
+++ b/docs/content/reference/api.md
@@ -3538,7 +3538,7 @@ Once set, this field cannot be changed.
(Optional)
disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
Once set, this field cannot be changed.
-Note: Disabling ‘openshift-samples’,‘Insights’ are only supported in OpenShift versions 4.20 and above.
+Note: Disabling ‘openshift-samples’,‘Insights’, ‘Console’ are only supported in OpenShift versions 4.20 and above.
@@ -9754,6 +9754,8 @@ ClusterVersionOperatorSpec
"baremetal" |
|
+
"Console" |
+ |
"ImageRegistry" |
|
"Insights" |
diff --git a/test/e2e/create_cluster_test.go b/test/e2e/create_cluster_test.go
index 89c22f92764..fad7d089aa3 100644
--- a/test/e2e/create_cluster_test.go
+++ b/test/e2e/create_cluster_test.go
@@ -1419,12 +1419,18 @@ func TestCreateClusterCustomConfig(t *testing.T) {
},
},
}
+ // Disable Console only for versions >= 4.20 due to OCPBUGS-57129 — the Hypershift-specific deployment is missing the capability.openshift.io/name: Console annotation.
+ disabledCaps := []hyperv1.OptionalCapability{
+ hyperv1.ImageRegistryCapability,
+ hyperv1.OpenShiftSamplesCapability,
+ hyperv1.InsightsCapability,
+ }
+ if e2eutil.IsGreaterThanOrEqualTo(e2eutil.Version420) {
+ disabledCaps = append(disabledCaps, hyperv1.ConsoleCapability)
+ }
+
hc.Spec.Capabilities = &hyperv1.Capabilities{
- Disabled: []hyperv1.OptionalCapability{
- hyperv1.ImageRegistryCapability,
- hyperv1.OpenShiftSamplesCapability,
- hyperv1.InsightsCapability,
- },
+ Disabled: disabledCaps,
}
}
}
@@ -1457,6 +1463,9 @@ func TestCreateClusterCustomConfig(t *testing.T) {
// ensure insights component is disabled
e2eutil.EnsureInsightsCapabilityDisabled(ctx, t, g, clients)
+
+ // ensure console component is disabled
+ e2eutil.EnsureConsoleCapabilityDisabled(ctx, t, g, clients)
}).Execute(&clusterOpts, globalOpts.Platform, globalOpts.ArtifactDir, "custom-config", globalOpts.ServiceAccountSigningKey)
}
diff --git a/test/e2e/util/util.go b/test/e2e/util/util.go
index b2c780e72e2..6e4deffc823 100644
--- a/test/e2e/util/util.go
+++ b/test/e2e/util/util.go
@@ -2670,3 +2670,19 @@ func EnsureInsightsCapabilityDisabled(ctx context.Context, t *testing.T, g Gomeg
g.Expect(err.Error()).To(ContainSubstring("namespaces \"openshift-insights\" not found"))
})
}
+
+// EnsureConsoleCapabilityDisabled validates the expectations for when ConsoleCapability is Disabled
+func EnsureConsoleCapabilityDisabled(ctx context.Context, t *testing.T, g Gomega, clients *GuestClients) {
+ t.Run("EnsureConsoleCapabilityDisabled", func(t *testing.T) {
+ AtLeast(t, Version420)
+
+ _, err := clients.CfgClient.ConfigV1().ClusterOperators().Get(ctx, "console", metav1.GetOptions{})
+ g.Expect(err).To(HaveOccurred())
+ g.Expect(err.Error()).To(ContainSubstring("clusteroperators.config.openshift.io \"console\" not found"))
+
+ // ensure console resources are not present
+ _, err = clients.KubeClient.CoreV1().Namespaces().Get(ctx, "openshift-console", metav1.GetOptions{})
+ g.Expect(err).To(HaveOccurred())
+ g.Expect(err.Error()).To(ContainSubstring("namespaces \"openshift-console\" not found"))
+ })
+}
diff --git a/test/e2e/util/version.go b/test/e2e/util/version.go
index 4ec408318ff..7290cd5421c 100644
--- a/test/e2e/util/version.go
+++ b/test/e2e/util/version.go
@@ -78,3 +78,7 @@ func CPOAtLeast(t *testing.T, version semver.Version, hc *hyperv1.HostedCluster)
func IsLessThan(version semver.Version) bool {
return releaseVersion.LT(version)
}
+
+func IsGreaterThanOrEqualTo(version semver.Version) bool {
+ return releaseVersion.GE(version)
+}
diff --git a/vendor/github.com/openshift/hypershift/api/hypershift/v1beta1/hostedcluster_types.go b/vendor/github.com/openshift/hypershift/api/hypershift/v1beta1/hostedcluster_types.go
index 01faa1e48c3..0ebeea79e75 100644
--- a/vendor/github.com/openshift/hypershift/api/hypershift/v1beta1/hostedcluster_types.go
+++ b/vendor/github.com/openshift/hypershift/api/hypershift/v1beta1/hostedcluster_types.go
@@ -379,13 +379,14 @@ const (
PruneRetentionPolicy RetentionPolicy = "Prune"
)
-// +kubebuilder:validation:Enum=ImageRegistry;openshift-samples;Insights;baremetal
+// +kubebuilder:validation:Enum=ImageRegistry;openshift-samples;Insights;baremetal;Console
type OptionalCapability string
const ImageRegistryCapability OptionalCapability = OptionalCapability(configv1.ClusterVersionCapabilityImageRegistry)
const OpenShiftSamplesCapability OptionalCapability = OptionalCapability(configv1.ClusterVersionCapabilityOpenShiftSamples)
const InsightsCapability OptionalCapability = OptionalCapability(configv1.ClusterVersionCapabilityInsights)
const BaremetalCapability OptionalCapability = OptionalCapability(configv1.ClusterVersionCapabilityBaremetal)
+const ConsoleCapability OptionalCapability = OptionalCapability(configv1.ClusterVersionCapabilityConsole)
// capabilities allows enabling or disabling optional components at install time.
// When this is not supplied, the cluster will use the DefaultCapabilitySet defined for the respective
@@ -407,7 +408,7 @@ type Capabilities struct {
// disabled when specified, explicitly disables the specified capabilitíes on the hosted cluster.
// Once set, this field cannot be changed.
//
- // Note: Disabling 'openshift-samples','Insights' are only supported in OpenShift versions 4.20 and above.
+ // Note: Disabling 'openshift-samples','Insights', 'Console' are only supported in OpenShift versions 4.20 and above.
//
// +listType=atomic
// +immutable