Skip to content

Commit 6a7223e

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2401 from eggfoobar/promote-feature-arbiter-default
OCPEDGE-1945: feat: promote HighlyAvailableArbiter feature to default
2 parents f0c2a50 + cc8f48a commit 6a7223e

12 files changed

+163
-102
lines changed

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

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,59 +21,63 @@ tests:
2121
kind: Infrastructure
2222
spec:
2323
platformSpec:
24-
aws: {}
25-
type: AWS
24+
baremetal: {}
25+
type: BareMetal
2626
updated: |
2727
apiVersion: config.openshift.io/v1
2828
kind: Infrastructure
2929
spec:
3030
platformSpec:
31-
type: AWS
32-
aws: {}
31+
type: BareMetal
32+
baremetal: {}
3333
status:
3434
controlPlaneTopology: DualReplica
3535
infrastructureTopology: HighlyAvailable
36-
platform: AWS
36+
platform: BareMetal
3737
platformStatus:
38-
aws: {}
39-
type: AWS
38+
baremetal:
39+
loadBalancer:
40+
type: OpenShiftManagedDefault
41+
type: BareMetal
4042
expected: |
4143
apiVersion: config.openshift.io/v1
4244
kind: Infrastructure
4345
spec:
4446
platformSpec:
45-
type: AWS
46-
aws: {}
47+
type: BareMetal
48+
baremetal: {}
4749
status:
4850
controlPlaneTopology: DualReplica
4951
cpuPartitioning: None
5052
infrastructureTopology: HighlyAvailable
51-
platform: AWS
53+
platform: BareMetal
5254
platformStatus:
53-
aws:
54-
cloudLoadBalancerConfig:
55-
dnsType: PlatformDefault
56-
type: AWS
55+
baremetal:
56+
loadBalancer:
57+
type: OpenShiftManagedDefault
58+
type: BareMetal
5759
- name: should not allow changing infrastructureTopology value to `DualReplica`
5860
initial: |
5961
apiVersion: config.openshift.io/v1
6062
kind: Infrastructure
6163
spec:
6264
platformSpec:
63-
aws: {}
64-
type: AWS
65+
baremetal: {}
66+
type: BareMetal
6567
updated: |
6668
apiVersion: config.openshift.io/v1
6769
kind: Infrastructure
6870
spec:
6971
platformSpec:
70-
type: AWS
71-
aws: {}
72+
type: BareMetal
73+
baremetal: {}
7274
status:
7375
controlPlaneTopology: HighlyAvailable
7476
infrastructureTopology: DualReplica
75-
platform: AWS
77+
platform: BareMetal
7678
platformStatus:
77-
aws: {}
78-
type: AWS
79+
baremetal:
80+
loadBalancer:
81+
type: OpenShiftManagedDefault
82+
type: BareMetal
7983
expectedStatusError: 'status.infrastructureTopology: Unsupported value: "DualReplica": supported values: "HighlyAvailable", "SingleReplica"'

‎config/v1/tests/infrastructures.config.openshift.io/HighlyAvailableArbiter+DualReplica.yaml

Lines changed: 48 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -22,121 +22,127 @@ tests:
2222
kind: Infrastructure
2323
spec:
2424
platformSpec:
25-
aws: {}
26-
type: AWS
25+
baremetal: {}
26+
type: BareMetal
2727
updated: |
2828
apiVersion: config.openshift.io/v1
2929
kind: Infrastructure
3030
spec:
3131
platformSpec:
32-
type: AWS
33-
aws: {}
32+
type: BareMetal
33+
baremetal: {}
3434
status:
3535
controlPlaneTopology: HighlyAvailableArbiter
3636
infrastructureTopology: HighlyAvailable
37-
platform: AWS
37+
platform: BareMetal
3838
platformStatus:
39-
aws: {}
40-
type: AWS
39+
baremetal: {}
40+
type: BareMetal
4141
expected: |
4242
apiVersion: config.openshift.io/v1
4343
kind: Infrastructure
4444
spec:
4545
platformSpec:
46-
type: AWS
47-
aws: {}
46+
type: BareMetal
47+
baremetal: {}
4848
status:
4949
controlPlaneTopology: HighlyAvailableArbiter
5050
cpuPartitioning: None
5151
infrastructureTopology: HighlyAvailable
52-
platform: AWS
52+
platform: BareMetal
5353
platformStatus:
54-
aws:
55-
cloudLoadBalancerConfig:
56-
dnsType: PlatformDefault
57-
type: AWS
54+
baremetal:
55+
loadBalancer:
56+
type: OpenShiftManagedDefault
57+
type: BareMetal
5858
- name: should not allow changing infrastructureTopology value to `HighlyAvailableArbiter`
5959
initial: |
6060
apiVersion: config.openshift.io/v1
6161
kind: Infrastructure
6262
spec:
6363
platformSpec:
64-
aws: {}
65-
type: AWS
64+
baremetal: {}
65+
type: BareMetal
6666
updated: |
6767
apiVersion: config.openshift.io/v1
6868
kind: Infrastructure
6969
spec:
7070
platformSpec:
71-
type: AWS
72-
aws: {}
71+
type: BareMetal
72+
baremetal: {}
7373
status:
7474
controlPlaneTopology: HighlyAvailable
7575
infrastructureTopology: HighlyAvailableArbiter
76-
platform: AWS
76+
platform: BareMetal
7777
platformStatus:
78-
aws: {}
79-
type: AWS
78+
baremetal:
79+
loadBalancer:
80+
type: OpenShiftManagedDefault
81+
type: BareMetal
8082
expectedStatusError: 'status.infrastructureTopology: Unsupported value: "HighlyAvailableArbiter": supported values: "HighlyAvailable", "SingleReplica"'
8183
- name: status should allow controlPlaneTopology value for `DualReplica`
8284
initial: |
8385
apiVersion: config.openshift.io/v1
8486
kind: Infrastructure
8587
spec:
8688
platformSpec:
87-
aws: {}
88-
type: AWS
89+
baremetal: {}
90+
type: BareMetal
8991
updated: |
9092
apiVersion: config.openshift.io/v1
9193
kind: Infrastructure
9294
spec:
9395
platformSpec:
94-
type: AWS
95-
aws: {}
96+
type: BareMetal
97+
baremetal: {}
9698
status:
9799
controlPlaneTopology: DualReplica
98100
infrastructureTopology: HighlyAvailable
99-
platform: AWS
101+
platform: BareMetal
100102
platformStatus:
101-
aws: {}
102-
type: AWS
103+
baremetal:
104+
loadBalancer:
105+
type: OpenShiftManagedDefault
106+
type: BareMetal
103107
expected: |
104108
apiVersion: config.openshift.io/v1
105109
kind: Infrastructure
106110
spec:
107111
platformSpec:
108-
type: AWS
109-
aws: {}
112+
type: BareMetal
113+
baremetal: {}
110114
status:
111115
controlPlaneTopology: DualReplica
112116
cpuPartitioning: None
113117
infrastructureTopology: HighlyAvailable
114-
platform: AWS
118+
platform: BareMetal
115119
platformStatus:
116-
aws:
117-
cloudLoadBalancerConfig:
118-
dnsType: PlatformDefault
119-
type: AWS
120+
baremetal:
121+
loadBalancer:
122+
type: OpenShiftManagedDefault
123+
type: BareMetal
120124
- name: should not allow changing infrastructureTopology value to `DualReplica`
121125
initial: |
122126
apiVersion: config.openshift.io/v1
123127
kind: Infrastructure
124128
spec:
125129
platformSpec:
126-
aws: {}
127-
type: AWS
130+
baremetal: {}
131+
type: BareMetal
128132
updated: |
129133
apiVersion: config.openshift.io/v1
130134
kind: Infrastructure
131135
spec:
132136
platformSpec:
133-
type: AWS
134-
aws: {}
137+
type: BareMetal
138+
baremetal: {}
135139
status:
136140
controlPlaneTopology: HighlyAvailable
137141
infrastructureTopology: DualReplica
138-
platform: AWS
142+
platform: BareMetal
139143
platformStatus:
140-
aws: {}
141-
type: AWS
144+
baremetal:
145+
loadBalancer:
146+
type: OpenShiftManagedDefault
147+
type: BareMetal
142148
expectedStatusError: 'status.infrastructureTopology: Unsupported value: "DualReplica": supported values: "HighlyAvailable", "SingleReplica"'

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

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,59 +21,61 @@ tests:
2121
kind: Infrastructure
2222
spec:
2323
platformSpec:
24-
aws: {}
25-
type: AWS
24+
baremetal: {}
25+
type: BareMetal
2626
updated: |
2727
apiVersion: config.openshift.io/v1
2828
kind: Infrastructure
2929
spec:
3030
platformSpec:
31-
type: AWS
32-
aws: {}
31+
type: BareMetal
32+
baremetal: {}
3333
status:
3434
controlPlaneTopology: HighlyAvailableArbiter
3535
infrastructureTopology: HighlyAvailable
36-
platform: AWS
36+
platform: BareMetal
3737
platformStatus:
38-
aws: {}
39-
type: AWS
38+
baremetal: {}
39+
type: BareMetal
4040
expected: |
4141
apiVersion: config.openshift.io/v1
4242
kind: Infrastructure
4343
spec:
4444
platformSpec:
45-
type: AWS
46-
aws: {}
45+
type: BareMetal
46+
baremetal: {}
4747
status:
4848
controlPlaneTopology: HighlyAvailableArbiter
4949
cpuPartitioning: None
5050
infrastructureTopology: HighlyAvailable
51-
platform: AWS
51+
platform: BareMetal
5252
platformStatus:
53-
aws:
54-
cloudLoadBalancerConfig:
55-
dnsType: PlatformDefault
56-
type: AWS
53+
baremetal:
54+
loadBalancer:
55+
type: OpenShiftManagedDefault
56+
type: BareMetal
5757
- name: should not allow changing infrastructureTopology value to `HighlyAvailableArbiter`
5858
initial: |
5959
apiVersion: config.openshift.io/v1
6060
kind: Infrastructure
6161
spec:
6262
platformSpec:
63-
aws: {}
64-
type: AWS
63+
baremetal: {}
64+
type: BareMetal
6565
updated: |
6666
apiVersion: config.openshift.io/v1
6767
kind: Infrastructure
6868
spec:
6969
platformSpec:
70-
type: AWS
71-
aws: {}
70+
type: BareMetal
71+
baremetal: {}
7272
status:
7373
controlPlaneTopology: HighlyAvailable
7474
infrastructureTopology: HighlyAvailableArbiter
75-
platform: AWS
75+
platform: BareMetal
7676
platformStatus:
77-
aws: {}
78-
type: AWS
77+
baremetal:
78+
loadBalancer:
79+
type: OpenShiftManagedDefault
80+
type: BareMetal
7981
expectedStatusError: 'status.infrastructureTopology: Unsupported value: "HighlyAvailableArbiter": supported values: "HighlyAvailable", "SingleReplica"'

‎config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,6 +1051,7 @@ spec:
10511051
its components are not visible within the cluster.
10521052
enum:
10531053
- HighlyAvailable
1054+
- HighlyAvailableArbiter
10541055
- SingleReplica
10551056
- External
10561057
type: string

‎features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
| GCPClusterHostedDNSInstall| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
4040
| GCPCustomAPIEndpoints| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
4141
| GCPCustomAPIEndpointsInstall| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
42-
| HighlyAvailableArbiter| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
4342
| ImageModeStatusReporting| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
4443
| ImageStreamImportMode| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
4544
| ImageVolume| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
@@ -83,6 +82,7 @@
8382
| ConsolePluginContentSecurityPolicy| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
8483
| GatewayAPI| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
8584
| GatewayAPIController| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
85+
| HighlyAvailableArbiter| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
8686
| IngressControllerLBSubnetsAWS| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
8787
| KMSv1| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
8888
| MachineConfigNodes| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |

‎features/features.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -698,11 +698,8 @@ var (
698698
contactPerson("eggfoobar").
699699
productScope(ocpSpecific).
700700
enhancementPR("https://github.com/openshift/enhancements/pull/1674").
701-
// TODO: Do not go GA until jira issue is resolved: https://issues.redhat.com/browse/OCPEDGE-1637
702-
// Annotations must correctly handle either DualReplica or HighlyAvailableArbiter going GA with
703-
// the other still in TechPreview.
704-
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
705-
mustRegister()
701+
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default).
702+
mustRegister()
706703

707704
FeatureGateCVOConfiguration = newFeatureGate("ClusterVersionOperatorConfiguration").
708705
reportProblemsToJiraComponent("Cluster Version Operator").

‎machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1332,6 +1332,7 @@ spec:
13321332
its components are not visible within the cluster.
13331333
enum:
13341334
- HighlyAvailable
1335+
- HighlyAvailableArbiter
13351336
- SingleReplica
13361337
- External
13371338
type: string

‎payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,6 +1051,7 @@ spec:
10511051
its components are not visible within the cluster.
10521052
enum:
10531053
- HighlyAvailable
1054+
- HighlyAvailableArbiter
10541055
- SingleReplica
10551056
- External
10561057
type: string

‎payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1332,6 +1332,7 @@ spec:
13321332
its components are not visible within the cluster.
13331333
enum:
13341334
- HighlyAvailable
1335+
- HighlyAvailableArbiter
13351336
- SingleReplica
13361337
- External
13371338
type: string

0 commit comments

Comments
 (0)