Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
name: "Infrastructure"
crdName: infrastructures.config.openshift.io
featureGates:
- HighlyAvailableArbiter
tests:
onCreate:
- name: Should be able to create a minimal Infrastructure
Expand Down
8 changes: 4 additions & 4 deletions config/v1/types_infrastructure.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@ type InfrastructureStatus struct {
// and the operators should not configure the operand for highly-available operation
// The 'External' mode indicates that the control plane is hosted externally to the cluster and that
// its components are not visible within the cluster.
// The 'HighlyAvailableArbiter' mode indicates that the control plane will consist of 2 control-plane nodes
// that run conventional services and 1 smaller sized arbiter node that runs a bare minimum of services to maintain quorum.
// +kubebuilder:default=HighlyAvailable
// +openshift:validation:FeatureGateAwareEnum:featureGate="",enum=HighlyAvailable;SingleReplica;External
// +openshift:validation:FeatureGateAwareEnum:featureGate=HighlyAvailableArbiter,enum=HighlyAvailable;HighlyAvailableArbiter;SingleReplica;External
// +openshift:validation:FeatureGateAwareEnum:featureGate=DualReplica,enum=HighlyAvailable;SingleReplica;DualReplica;External
// +openshift:validation:FeatureGateAwareEnum:requiredFeatureGate=HighlyAvailableArbiter;DualReplica,enum=HighlyAvailable;HighlyAvailableArbiter;SingleReplica;DualReplica;External
// +openshift:validation:FeatureGateAwareEnum:featureGate="",enum=HighlyAvailable;HighlyAvailableArbiter;SingleReplica;External
// +openshift:validation:FeatureGateAwareEnum:featureGate=DualReplica,enum=HighlyAvailable;HighlyAvailableArbiter;SingleReplica;DualReplica;External
// +optional
ControlPlaneTopology TopologyMode `json:"controlPlaneTopology"`

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1127,6 +1127,8 @@ spec:
and the operators should not configure the operand for highly-available operation
The 'External' mode indicates that the control plane is hosted externally to the cluster and that
its components are not visible within the cluster.
The 'HighlyAvailableArbiter' mode indicates that the control plane will consist of 2 control-plane nodes
that run conventional services and 1 smaller sized arbiter node that runs a bare minimum of services to maintain quorum.
enum:
- HighlyAvailable
- HighlyAvailableArbiter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1050,6 +1050,8 @@ spec:
and the operators should not configure the operand for highly-available operation
The 'External' mode indicates that the control plane is hosted externally to the cluster and that
its components are not visible within the cluster.
The 'HighlyAvailableArbiter' mode indicates that the control plane will consist of 2 control-plane nodes
that run conventional services and 1 smaller sized arbiter node that runs a bare minimum of services to maintain quorum.
enum:
- HighlyAvailable
- HighlyAvailableArbiter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1127,6 +1127,8 @@ spec:
and the operators should not configure the operand for highly-available operation
The 'External' mode indicates that the control plane is hosted externally to the cluster and that
its components are not visible within the cluster.
The 'HighlyAvailableArbiter' mode indicates that the control plane will consist of 2 control-plane nodes
that run conventional services and 1 smaller sized arbiter node that runs a bare minimum of services to maintain quorum.
enum:
- HighlyAvailable
- HighlyAvailableArbiter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1050,6 +1050,8 @@ spec:
and the operators should not configure the operand for highly-available operation
The 'External' mode indicates that the control plane is hosted externally to the cluster and that
its components are not visible within the cluster.
The 'HighlyAvailableArbiter' mode indicates that the control plane will consist of 2 control-plane nodes
that run conventional services and 1 smaller sized arbiter node that runs a bare minimum of services to maintain quorum.
enum:
- HighlyAvailable
- HighlyAvailableArbiter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1127,6 +1127,8 @@ spec:
and the operators should not configure the operand for highly-available operation
The 'External' mode indicates that the control plane is hosted externally to the cluster and that
its components are not visible within the cluster.
The 'HighlyAvailableArbiter' mode indicates that the control plane will consist of 2 control-plane nodes
that run conventional services and 1 smaller sized arbiter node that runs a bare minimum of services to maintain quorum.
enum:
- HighlyAvailable
- HighlyAvailableArbiter
Expand Down
2 changes: 0 additions & 2 deletions config/v1/zz_generated.featuregated-crd-manifests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -373,8 +373,6 @@ infrastructures.config.openshift.io:
- DualReplica
- DyanmicServiceEndpointIBMCloud
- GCPClusterHostedDNSInstall
- HighlyAvailableArbiter
- HighlyAvailableArbiter+DualReplica
- NutanixMultiSubnets
- OnPremDNSRecords
- VSphereHostVMGroupZonal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1038,8 +1038,11 @@ spec:
and the operators should not configure the operand for highly-available operation
The 'External' mode indicates that the control plane is hosted externally to the cluster and that
its components are not visible within the cluster.
The 'HighlyAvailableArbiter' mode indicates that the control plane will consist of 2 control-plane nodes
that run conventional services and 1 smaller sized arbiter node that runs a bare minimum of services to maintain quorum.
enum:
- HighlyAvailable
- HighlyAvailableArbiter
- SingleReplica
- External
type: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1036,6 +1036,8 @@ spec:
and the operators should not configure the operand for highly-available operation
The 'External' mode indicates that the control plane is hosted externally to the cluster and that
its components are not visible within the cluster.
The 'HighlyAvailableArbiter' mode indicates that the control plane will consist of 2 control-plane nodes
that run conventional services and 1 smaller sized arbiter node that runs a bare minimum of services to maintain quorum.
type: string
cpuPartitioning:
default: None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1036,6 +1036,8 @@ spec:
and the operators should not configure the operand for highly-available operation
The 'External' mode indicates that the control plane is hosted externally to the cluster and that
its components are not visible within the cluster.
The 'HighlyAvailableArbiter' mode indicates that the control plane will consist of 2 control-plane nodes
that run conventional services and 1 smaller sized arbiter node that runs a bare minimum of services to maintain quorum.
type: string
cpuPartitioning:
default: None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1036,6 +1036,8 @@ spec:
and the operators should not configure the operand for highly-available operation
The 'External' mode indicates that the control plane is hosted externally to the cluster and that
its components are not visible within the cluster.
The 'HighlyAvailableArbiter' mode indicates that the control plane will consist of 2 control-plane nodes
that run conventional services and 1 smaller sized arbiter node that runs a bare minimum of services to maintain quorum.
type: string
cpuPartitioning:
default: None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1036,6 +1036,8 @@ spec:
and the operators should not configure the operand for highly-available operation
The 'External' mode indicates that the control plane is hosted externally to the cluster and that
its components are not visible within the cluster.
The 'HighlyAvailableArbiter' mode indicates that the control plane will consist of 2 control-plane nodes
that run conventional services and 1 smaller sized arbiter node that runs a bare minimum of services to maintain quorum.
type: string
cpuPartitioning:
default: None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1036,8 +1036,11 @@ spec:
and the operators should not configure the operand for highly-available operation
The 'External' mode indicates that the control plane is hosted externally to the cluster and that
its components are not visible within the cluster.
The 'HighlyAvailableArbiter' mode indicates that the control plane will consist of 2 control-plane nodes
that run conventional services and 1 smaller sized arbiter node that runs a bare minimum of services to maintain quorum.
enum:
- HighlyAvailable
- HighlyAvailableArbiter
- SingleReplica
- DualReplica
- External
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1098,6 +1098,8 @@ spec:
and the operators should not configure the operand for highly-available operation
The 'External' mode indicates that the control plane is hosted externally to the cluster and that
its components are not visible within the cluster.
The 'HighlyAvailableArbiter' mode indicates that the control plane will consist of 2 control-plane nodes
that run conventional services and 1 smaller sized arbiter node that runs a bare minimum of services to maintain quorum.
type: string
cpuPartitioning:
default: None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1036,6 +1036,8 @@ spec:
and the operators should not configure the operand for highly-available operation
The 'External' mode indicates that the control plane is hosted externally to the cluster and that
its components are not visible within the cluster.
The 'HighlyAvailableArbiter' mode indicates that the control plane will consist of 2 control-plane nodes
that run conventional services and 1 smaller sized arbiter node that runs a bare minimum of services to maintain quorum.
type: string
cpuPartitioning:
default: None
Expand Down
Loading