Skip to content

fix: OCPBUGS-58422: Allow disabling Ingress without Console in HyperShift #8933

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

Open
stefanonardo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: OCPBUGS-58422: Allow disabling Ingress without Console in HyperShift #8933

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
1 change: 0 additions & 1 deletion api/hypershift/v1beta1/hostedcluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}

Expand Down
4 changes: 0 additions & 4 deletions ...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 @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...egated-crd-manifests/hostedclusters.hypershift.openshift.io/ClusterUpdateAcceptRisks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...manifests/hostedclusters.hypershift.openshift.io/ClusterVersionOperatorConfiguration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...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 @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...ests/hostedclusters.hypershift.openshift.io/ExternalOIDCWithUIDAndExtraClaimMappings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...-crd-manifests/hostedclusters.hypershift.openshift.io/ExternalOIDCWithUpstreamParity.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...erated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/GCPPlatform.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...ated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/HCPEtcdBackup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...fests/hostedclusters.hypershift.openshift.io/HyperShiftOnlyDynamicResourceAllocation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...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 @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...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 @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...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 @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...rated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/TLSAdherence.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...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 @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...d-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ClusterUpdateAcceptRisks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...ests/hostedcontrolplanes.hypershift.openshift.io/ClusterVersionOperatorConfiguration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ....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 @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...hostedcontrolplanes.hypershift.openshift.io/ExternalOIDCWithUIDAndExtraClaimMappings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...manifests/hostedcontrolplanes.hypershift.openshift.io/ExternalOIDCWithUpstreamParity.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...d.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/GCPPlatform.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/HCPEtcdBackup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions .../hostedcontrolplanes.hypershift.openshift.io/HyperShiftOnlyDynamicResourceAllocation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...ated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ImageStreamImportMode.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...ated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/KMSEncryptionProvider.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ...ted.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/OpenStack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions ....featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/TLSAdherence.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 2 additions & 4 deletions cmd/cluster/core/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[:], " "))
Expand Down
8 changes: 4 additions & 4 deletions cmd/cluster/core/create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,15 +343,15 @@ 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",
PullSecretFile: pullSecretFile,
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",
Expand Down Expand Up @@ -387,15 +387,15 @@ 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",
PullSecretFile: pullSecretFile,
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",
Expand Down
Loading
Loading