Skip to content

Commit 81ce3a9

Browse files
JoelSpeedJoelSpeed
committed
Drop BareMetalLoadBalancer feature gate
1 parent f158127 commit 81ce3a9

39 files changed

+2405
-4810
lines changed

‎config/v1/tests/infrastructures.config.openshift.io/BareMetalLoadBalancer.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
22
name: "Infrastructure"
33
crdName: infrastructures.config.openshift.io
4-
featureGates:
5-
- BareMetalLoadBalancer
64
tests:
75
onCreate:
86
- name: Should be able to create a minimal Infrastructure

‎config/v1/types_infrastructure.go

-4
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,6 @@ type BareMetalPlatformStatus struct {
10081008
// loadBalancer defines how the load balancer used by the cluster is configured.
10091009
// +default={"type": "OpenShiftManagedDefault"}
10101010
// +kubebuilder:default={"type": "OpenShiftManagedDefault"}
1011-
// +openshift:enable:FeatureGate=BareMetalLoadBalancer
10121011
// +optional
10131012
LoadBalancer *BareMetalPlatformLoadBalancer `json:"loadBalancer,omitempty"`
10141013

@@ -1222,7 +1221,6 @@ type OvirtPlatformStatus struct {
12221221
// loadBalancer defines how the load balancer used by the cluster is configured.
12231222
// +default={"type": "OpenShiftManagedDefault"}
12241223
// +kubebuilder:default={"type": "OpenShiftManagedDefault"}
1225-
// +openshift:enable:FeatureGate=BareMetalLoadBalancer
12261224
// +optional
12271225
LoadBalancer *OvirtPlatformLoadBalancer `json:"loadBalancer,omitempty"`
12281226
}
@@ -1671,7 +1669,6 @@ type VSpherePlatformStatus struct {
16711669
// loadBalancer defines how the load balancer used by the cluster is configured.
16721670
// +default={"type": "OpenShiftManagedDefault"}
16731671
// +kubebuilder:default={"type": "OpenShiftManagedDefault"}
1674-
// +openshift:enable:FeatureGate=BareMetalLoadBalancer
16751672
// +optional
16761673
LoadBalancer *VSpherePlatformLoadBalancer `json:"loadBalancer,omitempty"`
16771674

@@ -2089,7 +2086,6 @@ type NutanixPlatformStatus struct {
20892086
// loadBalancer defines how the load balancer used by the cluster is configured.
20902087
// +default={"type": "OpenShiftManagedDefault"}
20912088
// +kubebuilder:default={"type": "OpenShiftManagedDefault"}
2092-
// +openshift:enable:FeatureGate=BareMetalLoadBalancer
20932089
// +optional
20942090
LoadBalancer *NutanixPlatformLoadBalancer `json:"loadBalancer,omitempty"`
20952091
}

‎config/v1/zz_generated.featuregated-crd-manifests.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,6 @@ infrastructures.config.openshift.io:
314314
Category: ""
315315
FeatureGates:
316316
- AWSClusterHostedDNS
317-
- BareMetalLoadBalancer
318317
- DualReplica
319318
- DyanmicServiceEndpointIBMCloud
320319
- GCPClusterHostedDNS

‎config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AAA_ungated.yaml

+104
Original file line numberDiff line numberDiff line change
@@ -1367,6 +1367,32 @@ spec:
13671367
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
13681368
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
13691369
: true)'
1370+
loadBalancer:
1371+
default:
1372+
type: OpenShiftManagedDefault
1373+
description: loadBalancer defines how the load balancer used
1374+
by the cluster is configured.
1375+
properties:
1376+
type:
1377+
default: OpenShiftManagedDefault
1378+
description: |-
1379+
type defines the type of load balancer used by the cluster on BareMetal platform
1380+
which can be a user-managed or openshift-managed load balancer
1381+
that is to be used for the OpenShift API and Ingress endpoints.
1382+
When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing
1383+
defined in the machine config operator will be deployed.
1384+
When set to UserManaged these static pods will not be deployed and it is expected that
1385+
the load balancer is configured out of band by the deployer.
1386+
When omitted, this means no opinion and the platform is left to choose a reasonable default.
1387+
The default value is OpenShiftManagedDefault.
1388+
enum:
1389+
- OpenShiftManagedDefault
1390+
- UserManaged
1391+
type: string
1392+
x-kubernetes-validations:
1393+
- message: type is immutable once set
1394+
rule: oldSelf == '' || self == oldSelf
1395+
type: object
13701396
machineNetworks:
13711397
description: machineNetworks are IP networks used to connect
13721398
all the OpenShift cluster nodes.
@@ -1618,6 +1644,32 @@ spec:
16181644
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
16191645
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
16201646
: true)'
1647+
loadBalancer:
1648+
default:
1649+
type: OpenShiftManagedDefault
1650+
description: loadBalancer defines how the load balancer used
1651+
by the cluster is configured.
1652+
properties:
1653+
type:
1654+
default: OpenShiftManagedDefault
1655+
description: |-
1656+
type defines the type of load balancer used by the cluster on Nutanix platform
1657+
which can be a user-managed or openshift-managed load balancer
1658+
that is to be used for the OpenShift API and Ingress endpoints.
1659+
When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing
1660+
defined in the machine config operator will be deployed.
1661+
When set to UserManaged these static pods will not be deployed and it is expected that
1662+
the load balancer is configured out of band by the deployer.
1663+
When omitted, this means no opinion and the platform is left to choose a reasonable default.
1664+
The default value is OpenShiftManagedDefault.
1665+
enum:
1666+
- OpenShiftManagedDefault
1667+
- UserManaged
1668+
type: string
1669+
x-kubernetes-validations:
1670+
- message: type is immutable once set
1671+
rule: oldSelf == '' || self == oldSelf
1672+
type: object
16211673
type: object
16221674
openstack:
16231675
description: openstack contains settings specific to the OpenStack
@@ -1791,6 +1843,32 @@ spec:
17911843
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
17921844
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
17931845
: true)'
1846+
loadBalancer:
1847+
default:
1848+
type: OpenShiftManagedDefault
1849+
description: loadBalancer defines how the load balancer used
1850+
by the cluster is configured.
1851+
properties:
1852+
type:
1853+
default: OpenShiftManagedDefault
1854+
description: |-
1855+
type defines the type of load balancer used by the cluster on Ovirt platform
1856+
which can be a user-managed or openshift-managed load balancer
1857+
that is to be used for the OpenShift API and Ingress endpoints.
1858+
When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing
1859+
defined in the machine config operator will be deployed.
1860+
When set to UserManaged these static pods will not be deployed and it is expected that
1861+
the load balancer is configured out of band by the deployer.
1862+
When omitted, this means no opinion and the platform is left to choose a reasonable default.
1863+
The default value is OpenShiftManagedDefault.
1864+
enum:
1865+
- OpenShiftManagedDefault
1866+
- UserManaged
1867+
type: string
1868+
x-kubernetes-validations:
1869+
- message: type is immutable once set
1870+
rule: oldSelf == '' || self == oldSelf
1871+
type: object
17941872
nodeDNSIP:
17951873
description: 'deprecated: as of 4.6, this field is no longer
17961874
set or honored. It will be removed in a future release.'
@@ -1973,6 +2051,32 @@ spec:
19732051
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
19742052
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
19752053
: true)'
2054+
loadBalancer:
2055+
default:
2056+
type: OpenShiftManagedDefault
2057+
description: loadBalancer defines how the load balancer used
2058+
by the cluster is configured.
2059+
properties:
2060+
type:
2061+
default: OpenShiftManagedDefault
2062+
description: |-
2063+
type defines the type of load balancer used by the cluster on VSphere platform
2064+
which can be a user-managed or openshift-managed load balancer
2065+
that is to be used for the OpenShift API and Ingress endpoints.
2066+
When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing
2067+
defined in the machine config operator will be deployed.
2068+
When set to UserManaged these static pods will not be deployed and it is expected that
2069+
the load balancer is configured out of band by the deployer.
2070+
When omitted, this means no opinion and the platform is left to choose a reasonable default.
2071+
The default value is OpenShiftManagedDefault.
2072+
enum:
2073+
- OpenShiftManagedDefault
2074+
- UserManaged
2075+
type: string
2076+
x-kubernetes-validations:
2077+
- message: type is immutable once set
2078+
rule: oldSelf == '' || self == oldSelf
2079+
type: object
19762080
machineNetworks:
19772081
description: machineNetworks are IP networks used to connect
19782082
all the OpenShift cluster nodes.

‎config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AWSClusterHostedDNS.yaml

+104
Original file line numberDiff line numberDiff line change
@@ -1465,6 +1465,32 @@ spec:
14651465
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
14661466
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
14671467
: true)'
1468+
loadBalancer:
1469+
default:
1470+
type: OpenShiftManagedDefault
1471+
description: loadBalancer defines how the load balancer used
1472+
by the cluster is configured.
1473+
properties:
1474+
type:
1475+
default: OpenShiftManagedDefault
1476+
description: |-
1477+
type defines the type of load balancer used by the cluster on BareMetal platform
1478+
which can be a user-managed or openshift-managed load balancer
1479+
that is to be used for the OpenShift API and Ingress endpoints.
1480+
When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing
1481+
defined in the machine config operator will be deployed.
1482+
When set to UserManaged these static pods will not be deployed and it is expected that
1483+
the load balancer is configured out of band by the deployer.
1484+
When omitted, this means no opinion and the platform is left to choose a reasonable default.
1485+
The default value is OpenShiftManagedDefault.
1486+
enum:
1487+
- OpenShiftManagedDefault
1488+
- UserManaged
1489+
type: string
1490+
x-kubernetes-validations:
1491+
- message: type is immutable once set
1492+
rule: oldSelf == '' || self == oldSelf
1493+
type: object
14681494
machineNetworks:
14691495
description: machineNetworks are IP networks used to connect
14701496
all the OpenShift cluster nodes.
@@ -1716,6 +1742,32 @@ spec:
17161742
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
17171743
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
17181744
: true)'
1745+
loadBalancer:
1746+
default:
1747+
type: OpenShiftManagedDefault
1748+
description: loadBalancer defines how the load balancer used
1749+
by the cluster is configured.
1750+
properties:
1751+
type:
1752+
default: OpenShiftManagedDefault
1753+
description: |-
1754+
type defines the type of load balancer used by the cluster on Nutanix platform
1755+
which can be a user-managed or openshift-managed load balancer
1756+
that is to be used for the OpenShift API and Ingress endpoints.
1757+
When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing
1758+
defined in the machine config operator will be deployed.
1759+
When set to UserManaged these static pods will not be deployed and it is expected that
1760+
the load balancer is configured out of band by the deployer.
1761+
When omitted, this means no opinion and the platform is left to choose a reasonable default.
1762+
The default value is OpenShiftManagedDefault.
1763+
enum:
1764+
- OpenShiftManagedDefault
1765+
- UserManaged
1766+
type: string
1767+
x-kubernetes-validations:
1768+
- message: type is immutable once set
1769+
rule: oldSelf == '' || self == oldSelf
1770+
type: object
17191771
type: object
17201772
openstack:
17211773
description: openstack contains settings specific to the OpenStack
@@ -1889,6 +1941,32 @@ spec:
18891941
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
18901942
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
18911943
: true)'
1944+
loadBalancer:
1945+
default:
1946+
type: OpenShiftManagedDefault
1947+
description: loadBalancer defines how the load balancer used
1948+
by the cluster is configured.
1949+
properties:
1950+
type:
1951+
default: OpenShiftManagedDefault
1952+
description: |-
1953+
type defines the type of load balancer used by the cluster on Ovirt platform
1954+
which can be a user-managed or openshift-managed load balancer
1955+
that is to be used for the OpenShift API and Ingress endpoints.
1956+
When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing
1957+
defined in the machine config operator will be deployed.
1958+
When set to UserManaged these static pods will not be deployed and it is expected that
1959+
the load balancer is configured out of band by the deployer.
1960+
When omitted, this means no opinion and the platform is left to choose a reasonable default.
1961+
The default value is OpenShiftManagedDefault.
1962+
enum:
1963+
- OpenShiftManagedDefault
1964+
- UserManaged
1965+
type: string
1966+
x-kubernetes-validations:
1967+
- message: type is immutable once set
1968+
rule: oldSelf == '' || self == oldSelf
1969+
type: object
18921970
nodeDNSIP:
18931971
description: 'deprecated: as of 4.6, this field is no longer
18941972
set or honored. It will be removed in a future release.'
@@ -2071,6 +2149,32 @@ spec:
20712149
rule: 'self == oldSelf || (size(self) == 2 && isIP(self[0])
20722150
&& isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family()
20732151
: true)'
2152+
loadBalancer:
2153+
default:
2154+
type: OpenShiftManagedDefault
2155+
description: loadBalancer defines how the load balancer used
2156+
by the cluster is configured.
2157+
properties:
2158+
type:
2159+
default: OpenShiftManagedDefault
2160+
description: |-
2161+
type defines the type of load balancer used by the cluster on VSphere platform
2162+
which can be a user-managed or openshift-managed load balancer
2163+
that is to be used for the OpenShift API and Ingress endpoints.
2164+
When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing
2165+
defined in the machine config operator will be deployed.
2166+
When set to UserManaged these static pods will not be deployed and it is expected that
2167+
the load balancer is configured out of band by the deployer.
2168+
When omitted, this means no opinion and the platform is left to choose a reasonable default.
2169+
The default value is OpenShiftManagedDefault.
2170+
enum:
2171+
- OpenShiftManagedDefault
2172+
- UserManaged
2173+
type: string
2174+
x-kubernetes-validations:
2175+
- message: type is immutable once set
2176+
rule: oldSelf == '' || self == oldSelf
2177+
type: object
20742178
machineNetworks:
20752179
description: machineNetworks are IP networks used to connect
20762180
all the OpenShift cluster nodes.

0 commit comments

Comments
 (0)