Skip to content

Commit 75f8fdb

Browse files
jatinsujatinsu
committed
Introduce new OKD featureset and enable all default featuregates
1 parent 8187a76 commit 75f8fdb

File tree

2 files changed

+40
-35
lines changed

2 files changed

+40
-35
lines changed

‎config/v1/types_feature.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,12 @@ var (
5353
// your cluster may fail in an unrecoverable way.
5454
CustomNoUpgrade FeatureSet = "CustomNoUpgrade"
5555

56+
// OKD turns on features for OKD. Turning this feature set ON is supported for OKD clusters, but NOT for OpenShift clusters
57+
// this feature set on CANNOT BE UNDONE for OKD clusters and when enabled on OpenShift clusters it PREVENTS UPGRADES.
58+
OKD FeatureSet = "OKD"
59+
5660
// AllFixedFeatureSets are the featuresets that have known featuregates. Custom doesn't for instance. LatencySensitive is dead
57-
AllFixedFeatureSets = []FeatureSet{Default, TechPreviewNoUpgrade, DevPreviewNoUpgrade}
61+
AllFixedFeatureSets = []FeatureSet{Default, TechPreviewNoUpgrade, DevPreviewNoUpgrade, OKD}
5862
)
5963

6064
type FeatureGateSpec struct {
@@ -67,10 +71,11 @@ type FeatureGateSelection struct {
6771
// Turning on or off features may cause irreversible changes in your cluster which cannot be undone.
6872
// +unionDiscriminator
6973
// +optional
70-
// +kubebuilder:validation:Enum=CustomNoUpgrade;DevPreviewNoUpgrade;TechPreviewNoUpgrade;""
74+
// +kubebuilder:validation:Enum=CustomNoUpgrade;DevPreviewNoUpgrade;TechPreviewNoUpgrade;OKD;""
7175
// +kubebuilder:validation:XValidation:rule="oldSelf == 'CustomNoUpgrade' ? self == 'CustomNoUpgrade' : true",message="CustomNoUpgrade may not be changed"
7276
// +kubebuilder:validation:XValidation:rule="oldSelf == 'TechPreviewNoUpgrade' ? self == 'TechPreviewNoUpgrade' : true",message="TechPreviewNoUpgrade may not be changed"
7377
// +kubebuilder:validation:XValidation:rule="oldSelf == 'DevPreviewNoUpgrade' ? self == 'DevPreviewNoUpgrade' : true",message="DevPreviewNoUpgrade may not be changed"
78+
// +kubebuilder:validation:XValidation:rule="oldSelf == 'OKD' ? self == 'OKD' : true",message="OKD may not be changed"
7479
FeatureSet FeatureSet `json:"featureSet,omitempty"`
7580

7681
// customNoUpgrade allows the enabling or disabling of any feature. Turning this feature set on IS NOT SUPPORTED, CANNOT BE UNDONE, and PREVENTS UPGRADES.

‎features/features.go

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ var (
4040
reportProblemsToJiraComponent("Management Console").
4141
contactPerson("jhadvig").
4242
productScope(ocpSpecific).
43-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
43+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
4444
enhancementPR("https://github.com/openshift/enhancements/pull/1706").
4545
mustRegister()
4646

@@ -49,7 +49,7 @@ var (
4949
contactPerson("ibihim").
5050
productScope(kubernetes).
5151
enhancementPR("https://github.com/kubernetes/enhancements/issues/4193").
52-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
52+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
5353
mustRegister()
5454

5555
FeatureGateMutatingAdmissionPolicy = newFeatureGate("MutatingAdmissionPolicy").
@@ -65,31 +65,31 @@ var (
6565
contactPerson("miciah").
6666
productScope(ocpSpecific).
6767
enhancementPR(legacyFeatureGateWithoutEnhancement).
68-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
68+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
6969
mustRegister()
7070

7171
FeatureGateSetEIPForNLBIngressController = newFeatureGate("SetEIPForNLBIngressController").
7272
reportProblemsToJiraComponent("Networking / router").
7373
contactPerson("miheer").
7474
productScope(ocpSpecific).
7575
enhancementPR(legacyFeatureGateWithoutEnhancement).
76-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
76+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
7777
mustRegister()
7878

7979
FeatureGateOpenShiftPodSecurityAdmission = newFeatureGate("OpenShiftPodSecurityAdmission").
8080
reportProblemsToJiraComponent("auth").
8181
contactPerson("ibihim").
8282
productScope(ocpSpecific).
8383
enhancementPR("https://github.com/openshift/enhancements/pull/899").
84-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
84+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
8585
mustRegister()
8686

8787
FeatureGateBuildCSIVolumes = newFeatureGate("BuildCSIVolumes").
8888
reportProblemsToJiraComponent("builds").
8989
contactPerson("adkaplan").
9090
productScope(ocpSpecific).
9191
enhancementPR(legacyFeatureGateWithoutEnhancement).
92-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
92+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
9393
mustRegister()
9494

9595
FeatureGateNodeSwap = newFeatureGate("NodeSwap").
@@ -129,7 +129,7 @@ var (
129129
contactPerson("abutcher").
130130
productScope(ocpSpecific).
131131
enhancementPR(legacyFeatureGateWithoutEnhancement).
132-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
132+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
133133
mustRegister()
134134

135135
FeatureGateAzureDedicatedHosts = newFeatureGate("AzureDedicatedHosts").
@@ -176,7 +176,7 @@ var (
176176
contactPerson("jspeed").
177177
productScope(ocpSpecific).
178178
enhancementPR(legacyFeatureGateWithoutEnhancement).
179-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
179+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
180180
mustRegister()
181181

182182
FeatureGateVSphereHostVMGroupZonal = newFeatureGate("VSphereHostVMGroupZonal").
@@ -192,71 +192,71 @@ var (
192192
contactPerson("vr4manta").
193193
productScope(ocpSpecific).
194194
enhancementPR("https://github.com/openshift/enhancements/pull/1709").
195-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
195+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
196196
mustRegister()
197197

198198
FeatureGateRouteExternalCertificate = newFeatureGate("RouteExternalCertificate").
199199
reportProblemsToJiraComponent("router").
200200
contactPerson("chiragkyal").
201201
productScope(ocpSpecific).
202202
enhancementPR(legacyFeatureGateWithoutEnhancement).
203-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
203+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
204204
mustRegister()
205205

206206
FeatureGateCPMSMachineNamePrefix = newFeatureGate("CPMSMachineNamePrefix").
207207
reportProblemsToJiraComponent("Cloud Compute / ControlPlaneMachineSet").
208208
contactPerson("chiragkyal").
209209
productScope(ocpSpecific).
210210
enhancementPR("https://github.com/openshift/enhancements/pull/1714").
211-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
211+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
212212
mustRegister()
213213

214214
FeatureGateAdminNetworkPolicy = newFeatureGate("AdminNetworkPolicy").
215215
reportProblemsToJiraComponent("Networking/ovn-kubernetes").
216216
contactPerson("tssurya").
217217
productScope(ocpSpecific).
218218
enhancementPR(legacyFeatureGateWithoutEnhancement).
219-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
219+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
220220
mustRegister()
221221

222222
FeatureGateNetworkSegmentation = newFeatureGate("NetworkSegmentation").
223223
reportProblemsToJiraComponent("Networking/ovn-kubernetes").
224224
contactPerson("tssurya").
225225
productScope(ocpSpecific).
226226
enhancementPR("https://github.com/openshift/enhancements/pull/1623").
227-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
227+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
228228
mustRegister()
229229

230230
FeatureGateAdditionalRoutingCapabilities = newFeatureGate("AdditionalRoutingCapabilities").
231231
reportProblemsToJiraComponent("Networking/cluster-network-operator").
232232
contactPerson("jcaamano").
233233
productScope(ocpSpecific).
234234
enhancementPR(legacyFeatureGateWithoutEnhancement).
235-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
235+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
236236
mustRegister()
237237

238238
FeatureGateRouteAdvertisements = newFeatureGate("RouteAdvertisements").
239239
reportProblemsToJiraComponent("Networking/ovn-kubernetes").
240240
contactPerson("jcaamano").
241241
productScope(ocpSpecific).
242242
enhancementPR(legacyFeatureGateWithoutEnhancement).
243-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
243+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
244244
mustRegister()
245245

246246
FeatureGateNetworkLiveMigration = newFeatureGate("NetworkLiveMigration").
247247
reportProblemsToJiraComponent("Networking/ovn-kubernetes").
248248
contactPerson("pliu").
249249
productScope(ocpSpecific).
250250
enhancementPR(legacyFeatureGateWithoutEnhancement).
251-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
251+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
252252
mustRegister()
253253

254254
FeatureGateNetworkDiagnosticsConfig = newFeatureGate("NetworkDiagnosticsConfig").
255255
reportProblemsToJiraComponent("Networking/cluster-network-operator").
256256
contactPerson("kyrtapz").
257257
productScope(ocpSpecific).
258258
enhancementPR(legacyFeatureGateWithoutEnhancement).
259-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
259+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
260260
mustRegister()
261261

262262
FeatureGateOVNObservability = newFeatureGate("OVNObservability").
@@ -303,7 +303,7 @@ var (
303303
contactPerson("ijanssen").
304304
productScope(ocpSpecific).
305305
enhancementPR("https://github.com/openshift/enhancements/pull/1765").
306-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
306+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
307307
mustRegister()
308308

309309
FeatureGateImageModeStatusReporting = newFeatureGate("ImageModeStatusReporting").
@@ -358,15 +358,15 @@ var (
358358
contactPerson("djoshy").
359359
productScope(ocpSpecific).
360360
enhancementPR(legacyFeatureGateWithoutEnhancement).
361-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
361+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
362362
mustRegister()
363363

364364
FeatureGateManagedBootImagesAWS = newFeatureGate("ManagedBootImagesAWS").
365365
reportProblemsToJiraComponent("MachineConfigOperator").
366366
contactPerson("djoshy").
367367
productScope(ocpSpecific).
368368
enhancementPR(legacyFeatureGateWithoutEnhancement).
369-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
369+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
370370
mustRegister()
371371

372372
FeatureGateManagedBootImagesvSphere = newFeatureGate("ManagedBootImagesvSphere").
@@ -414,15 +414,15 @@ var (
414414
contactPerson("dgrisonnet").
415415
productScope(kubernetes).
416416
enhancementPR(legacyFeatureGateWithoutEnhancement).
417-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
417+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
418418
mustRegister()
419419

420420
FeatureGatePinnedImages = newFeatureGate("PinnedImages").
421421
reportProblemsToJiraComponent("MachineConfigOperator").
422422
contactPerson("RishabhSaini").
423423
productScope(ocpSpecific).
424424
enhancementPR(legacyFeatureGateWithoutEnhancement).
425-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
425+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
426426
mustRegister()
427427

428428
FeatureGateUpgradeStatus = newFeatureGate("UpgradeStatus").
@@ -471,7 +471,7 @@ var (
471471
productScope(ocpSpecific).
472472
enhancementPR("https://github.com/openshift/enhancements/pull/1596").
473473
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
474-
enableForClusterProfile(Hypershift, configv1.Default, configv1.TechPreviewNoUpgrade).
474+
enableForClusterProfile(Hypershift, configv1.Default, configv1.OKD, configv1.TechPreviewNoUpgrade).
475475
mustRegister()
476476

477477
FeatureGateExternalOIDCWithAdditionalClaimMappings = newFeatureGate("ExternalOIDCWithUIDAndExtraClaimMappings").
@@ -504,7 +504,7 @@ var (
504504
contactPerson("joe").
505505
productScope(ocpSpecific).
506506
enhancementPR(legacyFeatureGateWithoutEnhancement).
507-
enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default).
507+
enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default, configv1.OKD).
508508
mustRegister()
509509

510510
FeatureGateNewOLMCatalogdAPIV1Metas = newFeatureGate("NewOLMCatalogdAPIV1Metas").
@@ -560,7 +560,7 @@ var (
560560
contactPerson("rexagod").
561561
productScope(ocpSpecific).
562562
enhancementPR(legacyFeatureGateWithoutEnhancement).
563-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
563+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
564564
mustRegister()
565565

566566
FeatureGateClusterAPIInstallIBMCloud = newFeatureGate("ClusterAPIInstallIBMCloud").
@@ -576,7 +576,7 @@ var (
576576
contactPerson("flavianmissi").
577577
productScope(ocpSpecific).
578578
enhancementPR(legacyFeatureGateWithoutEnhancement).
579-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
579+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
580580
mustRegister()
581581

582582
FeatureGateMachineAPIMigration = newFeatureGate("MachineAPIMigration").
@@ -607,7 +607,7 @@ var (
607607
contactPerson("miciah").
608608
productScope(ocpSpecific).
609609
enhancementPR(legacyFeatureGateWithoutEnhancement).
610-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
610+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
611611
mustRegister()
612612

613613
FeatureGateImageStreamImportMode = newFeatureGate("ImageStreamImportMode").
@@ -623,7 +623,7 @@ var (
623623
contactPerson("haircommander").
624624
productScope(kubernetes).
625625
enhancementPR("https://github.com/kubernetes/enhancements/issues/127").
626-
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default).
626+
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default, configv1.OKD).
627627
mustRegister()
628628

629629
// Note: this feature is perma-alpha, but it is safe and desireable to enable.
@@ -634,23 +634,23 @@ var (
634634
contactPerson("haircommander").
635635
productScope(kubernetes).
636636
enhancementPR("https://github.com/kubernetes/enhancements/issues/127").
637-
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default).
637+
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default, configv1.OKD).
638638
mustRegister()
639639

640640
FeatureGateProcMountType = newFeatureGate("ProcMountType").
641641
reportProblemsToJiraComponent("Node").
642642
contactPerson("haircommander").
643643
productScope(kubernetes).
644644
enhancementPR("https://github.com/kubernetes/enhancements/issues/4265").
645-
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default).
645+
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default, configv1.OKD).
646646
mustRegister()
647647

648648
FeatureGateVSphereMultiNetworks = newFeatureGate("VSphereMultiNetworks").
649649
reportProblemsToJiraComponent("SPLAT").
650650
contactPerson("rvanderp").
651651
productScope(ocpSpecific).
652652
enhancementPR(legacyFeatureGateWithoutEnhancement).
653-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
653+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
654654
mustRegister()
655655

656656
FeatureGateIngressControllerDynamicConfigurationManager = newFeatureGate("IngressControllerDynamicConfigurationManager").
@@ -690,7 +690,7 @@ var (
690690
contactPerson("eggfoobar").
691691
productScope(ocpSpecific).
692692
enhancementPR("https://github.com/openshift/enhancements/pull/1674").
693-
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default).
693+
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default, configv1.OKD).
694694
mustRegister()
695695

696696
FeatureGateCVOConfiguration = newFeatureGate("ClusterVersionOperatorConfiguration").
@@ -743,7 +743,7 @@ var (
743743
// A dedicated feature gate now controls the Gateway Controller to distinguish
744744
// its production readiness from that of the CRDs.
745745
enhancementPR("https://github.com/openshift/enhancements/pull/1756").
746-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
746+
enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
747747
mustRegister()
748748

749749
FeatureShortCertRotation = newFeatureGate("ShortCertRotation").

0 commit comments

Comments
 (0)