Skip to content

MGMT-20771: Enable disabling of Console capability #6183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jul 9, 2025
Merged

MGMT-20771: Enable disabling of Console capability #6183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions api/hypershift/v1beta1/hostedcluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 3 additions & 1 deletion ...erated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/AAA_ungated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -186,6 +187,7 @@ spec:
- openshift-samples
- Insights
- baremetal
- Console
type: string
maxItems: 25
type: array
Expand Down
4 changes: 3 additions & 1 deletion ....featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/AutoNodeKarpenter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -233,6 +234,7 @@ spec:
- openshift-samples
- Insights
- baremetal
- Console
type: string
maxItems: 25
type: array
Expand Down
4 changes: 3 additions & 1 deletion ...manifests/hostedclusters.hypershift.openshift.io/ClusterVersionOperatorConfiguration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -186,6 +187,7 @@ spec:
- openshift-samples
- Insights
- baremetal
- Console
type: string
maxItems: 25
type: array
Expand Down
4 changes: 3 additions & 1 deletion ...gated-crd-manifests/hostedclusters.hypershift.openshift.io/DynamicResourceAllocation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -186,6 +187,7 @@ spec:
- openshift-samples
- Insights
- baremetal
- Console
type: string
maxItems: 25
type: array
Expand Down
4 changes: 3 additions & 1 deletion ...rated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ExternalOIDC.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -186,6 +187,7 @@ spec:
- openshift-samples
- Insights
- baremetal
- Console
type: string
maxItems: 25
type: array
Expand Down
4 changes: 3 additions & 1 deletion ...ests/hostedclusters.hypershift.openshift.io/ExternalOIDCWithUIDAndExtraClaimMappings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -186,6 +187,7 @@ spec:
- openshift-samples
- Insights
- baremetal
- Console
type: string
maxItems: 25
type: array
Expand Down
4 changes: 3 additions & 1 deletion ...turegated-crd-manifests/hostedclusters.hypershift.openshift.io/ImageStreamImportMode.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -186,6 +187,7 @@ spec:
- openshift-samples
- Insights
- baremetal
- Console
type: string
maxItems: 25
type: array
Expand Down
4 changes: 3 additions & 1 deletion ...turegated-crd-manifests/hostedclusters.hypershift.openshift.io/KMSEncryptionProvider.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -186,6 +187,7 @@ spec:
- openshift-samples
- Insights
- baremetal
- Console
type: string
maxItems: 25
type: array
Expand Down
4 changes: 3 additions & 1 deletion ...egated-crd-manifests/hostedclusters.hypershift.openshift.io/NetworkDiagnosticsConfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -186,6 +187,7 @@ spec:
- openshift-samples
- Insights
- baremetal
- Console
type: string
maxItems: 25
type: array
Expand Down
4 changes: 3 additions & 1 deletion ...enerated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/OpenStack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -186,6 +187,7 @@ spec:
- openshift-samples
- Insights
- baremetal
- Console
type: string
maxItems: 25
type: array
Expand Down
4 changes: 3 additions & 1 deletion ...d.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/AAA_ungated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -154,6 +155,7 @@ spec:
- openshift-samples
- Insights
- baremetal
- Console
type: string
maxItems: 25
type: array
Expand Down
4 changes: 3 additions & 1 deletion ...uregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/AutoNodeKarpenter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -201,6 +202,7 @@ spec:
- openshift-samples
- Insights
- baremetal
- Console
type: string
maxItems: 25
type: array
Expand Down
4 changes: 3 additions & 1 deletion ...ests/hostedcontrolplanes.hypershift.openshift.io/ClusterVersionOperatorConfiguration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -154,6 +155,7 @@ spec:
- openshift-samples
- Insights
- baremetal
- Console
type: string
maxItems: 25
type: array
Expand Down
4 changes: 3 additions & 1 deletion ...-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/DynamicResourceAllocation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -154,6 +155,7 @@ spec:
- openshift-samples
- Insights
- baremetal
- Console
type: string
maxItems: 25
type: array
Expand Down
4 changes: 3 additions & 1 deletion ....featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ExternalOIDC.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -154,6 +155,7 @@ spec:
- openshift-samples
- Insights
- baremetal
- Console
type: string
maxItems: 25
type: array
Expand Down
Loading