Skip to content

OCPBUGS-55662: Drop BareMetalLoadBalancer feature gate #2312

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
merged 1 commit into from
May 14, 2025
+2,405 −4,810
Merged

OCPBUGS-55662: Drop BareMetalLoadBalancer feature gate #2312

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
2 changes: 0 additions & 2 deletions config/v1/tests/infrastructures.config.openshift.io/BareMetalLoadBalancer.yaml
View file
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:
- BareMetalLoadBalancer
tests:
onCreate:
- name: Should be able to create a minimal Infrastructure
4 changes: 0 additions & 4 deletions config/v1/types_infrastructure.go
View file
Original file line number Diff line number Diff line change
@@ -1008,7 +1008,6 @@ type BareMetalPlatformStatus struct {
// loadBalancer defines how the load balancer used by the cluster is configured.
// +default={"type": "OpenShiftManagedDefault"}
// +kubebuilder:default={"type": "OpenShiftManagedDefault"}
// +openshift:enable:FeatureGate=BareMetalLoadBalancer
// +optional
LoadBalancer *BareMetalPlatformLoadBalancer `json:"loadBalancer,omitempty"`

@@ -1222,7 +1221,6 @@ type OvirtPlatformStatus struct {
// loadBalancer defines how the load balancer used by the cluster is configured.
// +default={"type": "OpenShiftManagedDefault"}
// +kubebuilder:default={"type": "OpenShiftManagedDefault"}
// +openshift:enable:FeatureGate=BareMetalLoadBalancer
// +optional
LoadBalancer *OvirtPlatformLoadBalancer `json:"loadBalancer,omitempty"`
}
@@ -1671,7 +1669,6 @@ type VSpherePlatformStatus struct {
// loadBalancer defines how the load balancer used by the cluster is configured.
// +default={"type": "OpenShiftManagedDefault"}
// +kubebuilder:default={"type": "OpenShiftManagedDefault"}
// +openshift:enable:FeatureGate=BareMetalLoadBalancer
// +optional
LoadBalancer *VSpherePlatformLoadBalancer `json:"loadBalancer,omitempty"`

@@ -2089,7 +2086,6 @@ type NutanixPlatformStatus struct {
// loadBalancer defines how the load balancer used by the cluster is configured.
// +default={"type": "OpenShiftManagedDefault"}
// +kubebuilder:default={"type": "OpenShiftManagedDefault"}
// +openshift:enable:FeatureGate=BareMetalLoadBalancer
// +optional
LoadBalancer *NutanixPlatformLoadBalancer `json:"loadBalancer,omitempty"`
}
1 change: 0 additions & 1 deletion config/v1/zz_generated.featuregated-crd-manifests.yaml
View file
Original file line number Diff line number Diff line change
@@ -314,7 +314,6 @@ infrastructures.config.openshift.io:
Category: ""
FeatureGates:
- AWSClusterHostedDNS
- BareMetalLoadBalancer
- DualReplica
- DyanmicServiceEndpointIBMCloud
- GCPClusterHostedDNS
104 changes: 104 additions & 0 deletions ...generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AAA_ungated.yaml
View file
Original file line number Diff line number Diff line change
@@ -1367,6 +1367,32 @@ spec:
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
: true)'
loadBalancer:
default:
type: OpenShiftManagedDefault
description: loadBalancer defines how the load balancer used
by the cluster is configured.
properties:
type:
default: OpenShiftManagedDefault
description: |-
type defines the type of load balancer used by the cluster on BareMetal platform
which can be a user-managed or openshift-managed load balancer
that is to be used for the OpenShift API and Ingress endpoints.
When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing
defined in the machine config operator will be deployed.
When set to UserManaged these static pods will not be deployed and it is expected that
the load balancer is configured out of band by the deployer.
When omitted, this means no opinion and the platform is left to choose a reasonable default.
The default value is OpenShiftManagedDefault.
enum:
- OpenShiftManagedDefault
- UserManaged
type: string
x-kubernetes-validations:
- message: type is immutable once set
rule: oldSelf == '' || self == oldSelf
type: object
machineNetworks:
description: machineNetworks are IP networks used to connect
all the OpenShift cluster nodes.
@@ -1618,6 +1644,32 @@ spec:
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
: true)'
loadBalancer:
default:
type: OpenShiftManagedDefault
description: loadBalancer defines how the load balancer used
by the cluster is configured.
properties:
type:
default: OpenShiftManagedDefault
description: |-
type defines the type of load balancer used by the cluster on Nutanix platform
which can be a user-managed or openshift-managed load balancer
that is to be used for the OpenShift API and Ingress endpoints.
When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing
defined in the machine config operator will be deployed.
When set to UserManaged these static pods will not be deployed and it is expected that
the load balancer is configured out of band by the deployer.
When omitted, this means no opinion and the platform is left to choose a reasonable default.
The default value is OpenShiftManagedDefault.
enum:
- OpenShiftManagedDefault
- UserManaged
type: string
x-kubernetes-validations:
- message: type is immutable once set
rule: oldSelf == '' || self == oldSelf
type: object
type: object
openstack:
description: openstack contains settings specific to the OpenStack
@@ -1791,6 +1843,32 @@ spec:
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
: true)'
loadBalancer:
default:
type: OpenShiftManagedDefault
description: loadBalancer defines how the load balancer used
by the cluster is configured.
properties:
type:
default: OpenShiftManagedDefault
description: |-
type defines the type of load balancer used by the cluster on Ovirt platform
which can be a user-managed or openshift-managed load balancer
that is to be used for the OpenShift API and Ingress endpoints.
When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing
defined in the machine config operator will be deployed.
When set to UserManaged these static pods will not be deployed and it is expected that
the load balancer is configured out of band by the deployer.
When omitted, this means no opinion and the platform is left to choose a reasonable default.
The default value is OpenShiftManagedDefault.
enum:
- OpenShiftManagedDefault
- UserManaged
type: string
x-kubernetes-validations:
- message: type is immutable once set
rule: oldSelf == '' || self == oldSelf
type: object
nodeDNSIP:
description: 'deprecated: as of 4.6, this field is no longer
set or honored. It will be removed in a future release.'
@@ -1973,6 +2051,32 @@ spec:
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
: true)'
loadBalancer:
default:
type: OpenShiftManagedDefault
description: loadBalancer defines how the load balancer used
by the cluster is configured.
properties:
type:
default: OpenShiftManagedDefault
description: |-
type defines the type of load balancer used by the cluster on VSphere platform
which can be a user-managed or openshift-managed load balancer
that is to be used for the OpenShift API and Ingress endpoints.
When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing
defined in the machine config operator will be deployed.
When set to UserManaged these static pods will not be deployed and it is expected that
the load balancer is configured out of band by the deployer.
When omitted, this means no opinion and the platform is left to choose a reasonable default.
The default value is OpenShiftManagedDefault.
enum:
- OpenShiftManagedDefault
- UserManaged
type: string
x-kubernetes-validations:
- message: type is immutable once set
rule: oldSelf == '' || self == oldSelf
type: object
machineNetworks:
description: machineNetworks are IP networks used to connect
all the OpenShift cluster nodes.
104 changes: 104 additions & 0 deletions ...d.featuregated-crd-manifests/infrastructures.config.openshift.io/AWSClusterHostedDNS.yaml
View file
Original file line number Diff line number Diff line change
@@ -1465,6 +1465,32 @@ spec:
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
: true)'
loadBalancer:
default:
type: OpenShiftManagedDefault
description: loadBalancer defines how the load balancer used
by the cluster is configured.
properties:
type:
default: OpenShiftManagedDefault
description: |-
type defines the type of load balancer used by the cluster on BareMetal platform
which can be a user-managed or openshift-managed load balancer
that is to be used for the OpenShift API and Ingress endpoints.
When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing
defined in the machine config operator will be deployed.
When set to UserManaged these static pods will not be deployed and it is expected that
the load balancer is configured out of band by the deployer.
When omitted, this means no opinion and the platform is left to choose a reasonable default.
The default value is OpenShiftManagedDefault.
enum:
- OpenShiftManagedDefault
- UserManaged
type: string
x-kubernetes-validations:
- message: type is immutable once set
rule: oldSelf == '' || self == oldSelf
type: object
machineNetworks:
description: machineNetworks are IP networks used to connect
all the OpenShift cluster nodes.
@@ -1716,6 +1742,32 @@ spec:
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
: true)'
loadBalancer:
default:
type: OpenShiftManagedDefault
description: loadBalancer defines how the load balancer used
by the cluster is configured.
properties:
type:
default: OpenShiftManagedDefault
description: |-
type defines the type of load balancer used by the cluster on Nutanix platform
which can be a user-managed or openshift-managed load balancer
that is to be used for the OpenShift API and Ingress endpoints.
When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing
defined in the machine config operator will be deployed.
When set to UserManaged these static pods will not be deployed and it is expected that
the load balancer is configured out of band by the deployer.
When omitted, this means no opinion and the platform is left to choose a reasonable default.
The default value is OpenShiftManagedDefault.
enum:
- OpenShiftManagedDefault
- UserManaged
type: string
x-kubernetes-validations:
- message: type is immutable once set
rule: oldSelf == '' || self == oldSelf
type: object
type: object
openstack:
description: openstack contains settings specific to the OpenStack
@@ -1889,6 +1941,32 @@ spec:
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
: true)'
loadBalancer:
default:
type: OpenShiftManagedDefault
description: loadBalancer defines how the load balancer used
by the cluster is configured.
properties:
type:
default: OpenShiftManagedDefault
description: |-
type defines the type of load balancer used by the cluster on Ovirt platform
which can be a user-managed or openshift-managed load balancer
that is to be used for the OpenShift API and Ingress endpoints.
When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing
defined in the machine config operator will be deployed.
When set to UserManaged these static pods will not be deployed and it is expected that
the load balancer is configured out of band by the deployer.
When omitted, this means no opinion and the platform is left to choose a reasonable default.
The default value is OpenShiftManagedDefault.
enum:
- OpenShiftManagedDefault
- UserManaged
type: string
x-kubernetes-validations:
- message: type is immutable once set
rule: oldSelf == '' || self == oldSelf
type: object
nodeDNSIP:
description: 'deprecated: as of 4.6, this field is no longer
set or honored. It will be removed in a future release.'
@@ -2071,6 +2149,32 @@ spec:
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
: true)'
loadBalancer:
default:
type: OpenShiftManagedDefault
description: loadBalancer defines how the load balancer used
by the cluster is configured.
properties:
type:
default: OpenShiftManagedDefault
description: |-
type defines the type of load balancer used by the cluster on VSphere platform
which can be a user-managed or openshift-managed load balancer
that is to be used for the OpenShift API and Ingress endpoints.
When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing
defined in the machine config operator will be deployed.
When set to UserManaged these static pods will not be deployed and it is expected that
the load balancer is configured out of band by the deployer.
When omitted, this means no opinion and the platform is left to choose a reasonable default.
The default value is OpenShiftManagedDefault.
enum:
- OpenShiftManagedDefault
- UserManaged
type: string
x-kubernetes-validations:
- message: type is immutable once set
rule: oldSelf == '' || self == oldSelf
type: object
machineNetworks:
description: machineNetworks are IP networks used to connect
all the OpenShift cluster nodes.
Loading