diff --git a/api/hypershift/v1beta1/hostedcluster_types.go b/api/hypershift/v1beta1/hostedcluster_types.go index c26677a63aa8..88ebef7ef106 100644 --- a/api/hypershift/v1beta1/hostedcluster_types.go +++ b/api/hypershift/v1beta1/hostedcluster_types.go @@ -518,7 +518,6 @@ type Capabilities struct { // +optional // +kubebuilder:validation:MaxItems=25 // +kubebuilder:validation:XValidation:rule="self == oldSelf", message="Disabled is immutable. Changes might result in unpredictable and disruptive behavior." - // +kubebuilder:validation:XValidation:rule="!self.exists(cap, cap == 'Ingress') || self.exists(cap, cap == 'Console')",message="Ingress capability can only be disabled if Console capability is also disabled" Disabled []OptionalCapability `json:"disabled,omitempty"` } 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 4d544c17ddf6..4c2204bf37c6 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 @@ -462,10 +462,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ClusterUpdateAcceptRisks.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ClusterUpdateAcceptRisks.yaml index a2d326883d96..981f91a1b60a 100644 --- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ClusterUpdateAcceptRisks.yaml +++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ClusterUpdateAcceptRisks.yaml @@ -462,10 +462,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. 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 1bf220461eef..cce0faf52933 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 @@ -462,10 +462,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. 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 bde5919d071b..bb679938d683 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 @@ -462,10 +462,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. 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 30e55779e97b..40b7361ca1e4 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 @@ -462,10 +462,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ExternalOIDCWithUpstreamParity.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ExternalOIDCWithUpstreamParity.yaml index 8cbe6f554d78..3e64b596cbf6 100644 --- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ExternalOIDCWithUpstreamParity.yaml +++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ExternalOIDCWithUpstreamParity.yaml @@ -462,10 +462,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/GCPPlatform.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/GCPPlatform.yaml index 0122e9e30468..553deb9e4bf2 100644 --- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/GCPPlatform.yaml +++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/GCPPlatform.yaml @@ -462,10 +462,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/HCPEtcdBackup.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/HCPEtcdBackup.yaml index 264b4d5d1089..99c566a369fa 100644 --- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/HCPEtcdBackup.yaml +++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/HCPEtcdBackup.yaml @@ -462,10 +462,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/HyperShiftOnlyDynamicResourceAllocation.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/HyperShiftOnlyDynamicResourceAllocation.yaml index dd8b23bde0c0..6c5761a3a8fe 100644 --- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/HyperShiftOnlyDynamicResourceAllocation.yaml +++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/HyperShiftOnlyDynamicResourceAllocation.yaml @@ -462,10 +462,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. 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 ede268058ec0..695cb907b3c4 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 @@ -462,10 +462,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. 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 630bb3ee5156..b3ec1e51fc9f 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 @@ -462,10 +462,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. 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 a2e929616593..b4180a937ff2 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 @@ -462,10 +462,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/TLSAdherence.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/TLSAdherence.yaml index f06c4d1801ce..66c62bc14298 100644 --- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/TLSAdherence.yaml +++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/TLSAdherence.yaml @@ -462,10 +462,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. 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 8e1182fd319b..da587839211a 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 @@ -418,10 +418,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ClusterUpdateAcceptRisks.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ClusterUpdateAcceptRisks.yaml index ffa3ddad4d86..950a0d964ced 100644 --- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ClusterUpdateAcceptRisks.yaml +++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ClusterUpdateAcceptRisks.yaml @@ -418,10 +418,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. 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 8e53c82c8c10..4624cde8fa48 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 @@ -418,10 +418,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. 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 84b57ce38140..56c45b6fb7b9 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 @@ -418,10 +418,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. 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 dbdbe0895029..1202058bf388 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 @@ -418,10 +418,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ExternalOIDCWithUpstreamParity.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ExternalOIDCWithUpstreamParity.yaml index 2a7bb80ceb42..e31a5298bd32 100644 --- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ExternalOIDCWithUpstreamParity.yaml +++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ExternalOIDCWithUpstreamParity.yaml @@ -418,10 +418,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/GCPPlatform.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/GCPPlatform.yaml index ed48982b0ac2..da471d974763 100644 --- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/GCPPlatform.yaml +++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/GCPPlatform.yaml @@ -418,10 +418,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/HCPEtcdBackup.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/HCPEtcdBackup.yaml index db7218933ac8..9de938b050f4 100644 --- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/HCPEtcdBackup.yaml +++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/HCPEtcdBackup.yaml @@ -418,10 +418,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/HyperShiftOnlyDynamicResourceAllocation.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/HyperShiftOnlyDynamicResourceAllocation.yaml index 007370476513..fa4b4f6e47c2 100644 --- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/HyperShiftOnlyDynamicResourceAllocation.yaml +++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/HyperShiftOnlyDynamicResourceAllocation.yaml @@ -418,10 +418,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. 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 465a38bbfcaa..ed5aa8693256 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 @@ -418,10 +418,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. 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 d9d3d7604c59..9bfdb8e51d54 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 @@ -418,10 +418,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. 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 b18955c36417..eb00da152fd0 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 @@ -418,10 +418,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. diff --git a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/TLSAdherence.yaml b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/TLSAdherence.yaml index 36dfa0e9f0af..360fa48abaab 100644 --- a/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/TLSAdherence.yaml +++ b/api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/TLSAdherence.yaml @@ -418,10 +418,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. diff --git a/cmd/cluster/core/create.go b/cmd/cluster/core/create.go index 1ab5236f8637..c9fcab7d4352 100644 --- a/cmd/cluster/core/create.go +++ b/cmd/cluster/core/create.go @@ -846,10 +846,8 @@ func (opts *RawCreateOptions) validateCapabilities() error { return fmt.Errorf("unknown enabled capability: %s, accepted values are: %v", capability, acceptedValues.List()) } } - disabledCaps := sets.NewString(opts.DisableClusterCapabilities...) - if disabledCaps.Has(string(hyperv1.IngressCapability)) && !disabledCaps.Has(string(hyperv1.ConsoleCapability)) { - return fmt.Errorf("ingress capability can only be disabled if Console capability is also disabled") - } + + if len(opts.KubeAPIServerDNSName) > 0 { if err := validation.IsDNS1123Subdomain(opts.KubeAPIServerDNSName); len(err) > 0 { return fmt.Errorf("KubeAPIServerDNSName failed DNS validation: %s", strings.Join(err[:], " ")) diff --git a/cmd/cluster/core/create_test.go b/cmd/cluster/core/create_test.go index 802fb0c14303..3e088dbd2fb3 100644 --- a/cmd/cluster/core/create_test.go +++ b/cmd/cluster/core/create_test.go @@ -343,7 +343,7 @@ func TestValidate(t *testing.T) { expectedErr: "", }, { - name: "fails when ingress is disabled but console is not disabled", + name: "passes when only ingress is disabled", rawOpts: &RawCreateOptions{ Name: "test-hc", Namespace: "test-hc", @@ -351,7 +351,7 @@ func TestValidate(t *testing.T) { Arch: "amd64", DisableClusterCapabilities: []string{"Ingress"}, }, - expectedErr: "ingress capability can only be disabled if Console capability is also disabled", + expectedErr: "", }, { name: "passes when both ingress and console are disabled", @@ -387,7 +387,7 @@ func TestValidate(t *testing.T) { expectedErr: "", }, { - name: "fails when ingress is disabled with other capabilities but console is not disabled", + name: "passes when ingress is disabled with other capabilities but console is not disabled", rawOpts: &RawCreateOptions{ Name: "test-hc", Namespace: "test-hc", @@ -395,7 +395,7 @@ func TestValidate(t *testing.T) { Arch: "amd64", DisableClusterCapabilities: []string{"Ingress", "ImageRegistry"}, }, - expectedErr: "ingress capability can only be disabled if Console capability is also disabled", + expectedErr: "", }, { name: "passes when disable-multi-network is used with network-type=Other", diff --git a/cmd/install/assets/crds/hypershift-operator/tests/hostedclusters.hypershift.openshift.io/stable.hostedclusters.capabilities.testsuite.yaml b/cmd/install/assets/crds/hypershift-operator/tests/hostedclusters.hypershift.openshift.io/stable.hostedclusters.capabilities.testsuite.yaml index 85e45294654c..6466aa2c2b2e 100644 --- a/cmd/install/assets/crds/hypershift-operator/tests/hostedclusters.hypershift.openshift.io/stable.hostedclusters.capabilities.testsuite.yaml +++ b/cmd/install/assets/crds/hypershift-operator/tests/hostedclusters.hypershift.openshift.io/stable.hostedclusters.capabilities.testsuite.yaml @@ -373,8 +373,8 @@ tests: route: {} expectedError: "Capabilities can not be both enabled and disabled at once." - # --- Ingress/Console capability dependency --- - - name: When Ingress capability is disabled but Console capability is enabled it should fail + # --- Ingress/Console capability independence --- + - name: When Ingress capability is disabled but Console capability is enabled it should pass initial: | apiVersion: hypershift.openshift.io/v1beta1 kind: HostedCluster @@ -414,7 +414,6 @@ tests: servicePublishingStrategy: type: Route route: {} - expectedError: "Ingress capability can only be disabled if Console capability is also disabled" - name: When both Ingress and Console capabilities are disabled it should pass initial: | diff --git a/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedclusters-Hypershift-CustomNoUpgrade.crd.yaml b/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedclusters-Hypershift-CustomNoUpgrade.crd.yaml index 4d0f243131b7..24c820350fbc 100644 --- a/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedclusters-Hypershift-CustomNoUpgrade.crd.yaml +++ b/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedclusters-Hypershift-CustomNoUpgrade.crd.yaml @@ -464,10 +464,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. diff --git a/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedclusters-Hypershift-Default.crd.yaml b/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedclusters-Hypershift-Default.crd.yaml index 2cf2896f4677..bc6b6300821b 100644 --- a/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedclusters-Hypershift-Default.crd.yaml +++ b/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedclusters-Hypershift-Default.crd.yaml @@ -464,10 +464,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. diff --git a/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedclusters-Hypershift-TechPreviewNoUpgrade.crd.yaml b/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedclusters-Hypershift-TechPreviewNoUpgrade.crd.yaml index 14b73f26b7c3..75a7b9e95b32 100644 --- a/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedclusters-Hypershift-TechPreviewNoUpgrade.crd.yaml +++ b/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedclusters-Hypershift-TechPreviewNoUpgrade.crd.yaml @@ -464,10 +464,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. diff --git a/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-Hypershift-CustomNoUpgrade.crd.yaml b/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-Hypershift-CustomNoUpgrade.crd.yaml index 8bb34c854a5f..8faf0c8c520e 100644 --- a/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-Hypershift-CustomNoUpgrade.crd.yaml +++ b/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-Hypershift-CustomNoUpgrade.crd.yaml @@ -420,10 +420,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. diff --git a/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-Hypershift-Default.crd.yaml b/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-Hypershift-Default.crd.yaml index c167f5f107ff..112628000cda 100644 --- a/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-Hypershift-Default.crd.yaml +++ b/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-Hypershift-Default.crd.yaml @@ -420,10 +420,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. diff --git a/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-Hypershift-TechPreviewNoUpgrade.crd.yaml b/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-Hypershift-TechPreviewNoUpgrade.crd.yaml index d441186c3403..12a543124fe6 100644 --- a/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-Hypershift-TechPreviewNoUpgrade.crd.yaml +++ b/cmd/install/assets/crds/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-Hypershift-TechPreviewNoUpgrade.crd.yaml @@ -420,10 +420,6 @@ spec: - message: Disabled is immutable. Changes might result in unpredictable and disruptive behavior. rule: self == oldSelf - - message: Ingress capability can only be disabled if Console - capability is also disabled - rule: '!self.exists(cap, cap == ''Ingress'') || self.exists(cap, - cap == ''Console'')' enabled: description: |- enabled when specified, explicitly enables the specified capabilitíes on the hosted cluster. 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 c26677a63aa8..88ebef7ef106 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 @@ -518,7 +518,6 @@ type Capabilities struct { // +optional // +kubebuilder:validation:MaxItems=25 // +kubebuilder:validation:XValidation:rule="self == oldSelf", message="Disabled is immutable. Changes might result in unpredictable and disruptive behavior." - // +kubebuilder:validation:XValidation:rule="!self.exists(cap, cap == 'Ingress') || self.exists(cap, cap == 'Console')",message="Ingress capability can only be disabled if Console capability is also disabled" Disabled []OptionalCapability `json:"disabled,omitempty"` }