Merge pull request #2437 from umohnani8/fg

Remove OnClusterBuild fg

Author: openshift-merge-bot[bot]

features.md

@@ -92,7 +92,6 @@
 | NetworkDiagnosticsConfig| <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>  |
 | NetworkLiveMigration| <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>  |
 | NetworkSegmentation| <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>  |
-| OnClusterBuild| <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>  |
 | OpenShiftPodSecurityAdmission| <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>  |
 | PinnedImages| <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>  |
 | ProcMountType| <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

@@ -393,14 +393,6 @@ var (
 						enableIn(configv1.DevPreviewNoUpgrade).
 						mustRegister()
 
-	FeatureGateOnClusterBuild = newFeatureGate("OnClusterBuild").
-					reportProblemsToJiraComponent("MachineConfigOperator").
-					contactPerson("cheesesashimi").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
-
 	FeatureGateBootcNodeManagement = newFeatureGate("BootcNodeManagement").
 					reportProblemsToJiraComponent("MachineConfigOperator").
 					contactPerson("inesqyx").

features/legacyfeaturegates.go

@@ -91,8 +91,6 @@ var legacyFeatureGates = sets.New(
 	// never add to this list, if you think you have an exception ask @deads2k
 	"OVNObservability",
 	// never add to this list, if you think you have an exception ask @deads2k
-	"OnClusterBuild",
-	// never add to this list, if you think you have an exception ask @deads2k
 	"PersistentIPsForVirtualization",
 	// never add to this list, if you think you have an exception ask @deads2k
 	"PinnedImages",

machineconfiguration/install.go

@@ -5,14 +5,13 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	machineconfigurationv1 "github.com/openshift/api/machineconfiguration/v1"
-	machineconfigurationv1alpha "github.com/openshift/api/machineconfiguration/v1alpha1"
 )
 
 // GroupName defines the API group for machineconfiguration.
 const GroupName = "machineconfiguration.openshift.io"
 
 var (
-	SchemeBuilder = runtime.NewSchemeBuilder(machineconfigurationv1.Install, machineconfigurationv1alpha.Install)
+	SchemeBuilder = runtime.NewSchemeBuilder(machineconfigurationv1.Install)
 	// Install is a function which adds every version of this group to a scheme
 	Install = SchemeBuilder.AddToScheme
 )

machineconfiguration/v1/tests/machineosbuilds.machineconfiguration.openshift.io/OnClusterBuild.yaml renamed to machineconfiguration/v1/tests/machineosbuilds.machineconfiguration.openshift.io/AAA_ungated.yaml

@@ -1,7 +1,6 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "MachineOSBuild"
 crdName: machineosbuilds.machineconfiguration.openshift.io
-featureGate: OnClusterBuild
 tests:
   onCreate:
     - name: Should be able to create a minimal MachineOSBuild

machineconfiguration/v1/tests/machineosconfigs.machineconfiguration.openshift.io/OnClusterBuild.yaml renamed to machineconfiguration/v1/tests/machineosconfigs.machineconfiguration.openshift.io/AAA_ungated.yaml

@@ -1,7 +1,6 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "MachineOSConfig"
 crdName: machineosconfigs.machineconfiguration.openshift.io
-featureGate: OnClusterBuild
 tests:
   onCreate:
     - name: Should be able to create a minimal MachineOSConfig

machineconfiguration/v1/types_machineosbuild.go

@@ -11,7 +11,6 @@ import (
 // +kubebuilder:resource:path=machineosbuilds,scope=Cluster
 // +kubebuilder:subresource:status
 // +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/2090
-// +openshift:enable:FeatureGate=OnClusterBuild
 // +openshift:file-pattern=cvoRunLevel=0000_80,operatorName=machine-config,operatorOrdering=01
 // +kubebuilder:metadata:labels=openshift.io/operator-managed=
 // +kubebuilder:printcolumn:name="Prepared",type="string",JSONPath=.status.conditions[?(@.type=="Prepared")].status

machineconfiguration/v1/types_machineosconfig.go

@@ -11,7 +11,6 @@ import (
 // +kubebuilder:resource:path=machineosconfigs,scope=Cluster
 // +kubebuilder:subresource:status
 // +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/2090
-// +openshift:enable:FeatureGate=OnClusterBuild
 // +openshift:file-pattern=cvoRunLevel=0000_80,operatorName=machine-config,operatorOrdering=01
 // +kubebuilder:metadata:labels=openshift.io/operator-managed=
 

machineconfiguration/v1/zz_generated.featuregated-crd-manifests.yaml

@@ -254,8 +254,7 @@ machineosbuilds.machineconfiguration.openshift.io:
   CRDName: machineosbuilds.machineconfiguration.openshift.io
   Capability: ""
   Category: ""
-  FeatureGates:
-  - OnClusterBuild
+  FeatureGates: []
   FilenameOperatorName: machine-config
   FilenameOperatorOrdering: "01"
   FilenameRunLevel: "0000_80"
@@ -286,8 +285,7 @@ machineosbuilds.machineconfiguration.openshift.io:
     type: date
   Scope: Cluster
   ShortNames: null
-  TopLevelFeatureGates:
-  - OnClusterBuild
+  TopLevelFeatureGates: []
   Version: v1
 
 machineosconfigs.machineconfiguration.openshift.io:
@@ -296,8 +294,7 @@ machineosconfigs.machineconfiguration.openshift.io:
   CRDName: machineosconfigs.machineconfiguration.openshift.io
   Capability: ""
   Category: ""
-  FeatureGates:
-  - OnClusterBuild
+  FeatureGates: []
   FilenameOperatorName: machine-config
   FilenameOperatorOrdering: "01"
   FilenameRunLevel: "0000_80"
@@ -310,8 +307,7 @@ machineosconfigs.machineconfiguration.openshift.io:
   PrinterColumns: []
   Scope: Cluster
   ShortNames: null
-  TopLevelFeatureGates:
-  - OnClusterBuild
+  TopLevelFeatureGates: []
   Version: v1
 
 pinnedimagesets.machineconfiguration.openshift.io:

machineconfiguration/v1/zz_generated.featuregated-crd-manifests/machineosbuilds.machineconfiguration.openshift.io/OnClusterBuild.yaml renamed to machineconfiguration/v1/zz_generated.featuregated-crd-manifests/machineosbuilds.machineconfiguration.openshift.io/AAA_ungated.yaml

@@ -6,7 +6,7 @@ metadata:
     api.openshift.io/filename-cvo-runlevel: "0000_80"
     api.openshift.io/filename-operator: machine-config
     api.openshift.io/filename-ordering: "01"
-    feature-gate.release.openshift.io/OnClusterBuild: "true"
+    feature-gate.release.openshift.io/: "true"
   labels:
     openshift.io/operator-managed: ""
   name: machineosbuilds.machineconfiguration.openshift.io