Skip to content

Commit 34b2427

Browse files
committed
Remove OnClusterBuild fg
Remove the OnclusterBuild feature gate as the image mode API was promoted in 4.19. And remove the v1alpha1 API for MachineOSConfig and MachineOSBuild Signed-off-by: Urvashi <[email protected]>
1 parent 9f36190 commit 34b2427

File tree

32 files changed

+7
-3781
lines changed

32 files changed

+7
-3781
lines changed

features.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@
9292
| 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> |
9393
| 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> |
9494
| 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> |
95-
| 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> |
9695
| 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> |
9796
| 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> |
9897
| 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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -392,14 +392,6 @@ var (
392392
enableIn(configv1.DevPreviewNoUpgrade).
393393
mustRegister()
394394

395-
FeatureGateOnClusterBuild = newFeatureGate("OnClusterBuild").
396-
reportProblemsToJiraComponent("MachineConfigOperator").
397-
contactPerson("cheesesashimi").
398-
productScope(ocpSpecific).
399-
enhancementPR(legacyFeatureGateWithoutEnhancement).
400-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
401-
mustRegister()
402-
403395
FeatureGateBootcNodeManagement = newFeatureGate("BootcNodeManagement").
404396
reportProblemsToJiraComponent("MachineConfigOperator").
405397
contactPerson("inesqyx").

features/legacyfeaturegates.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ var legacyFeatureGates = sets.New(
9191
// never add to this list, if you think you have an exception ask @deads2k
9292
"OVNObservability",
9393
// never add to this list, if you think you have an exception ask @deads2k
94-
"OnClusterBuild",
95-
// never add to this list, if you think you have an exception ask @deads2k
9694
"PersistentIPsForVirtualization",
9795
// never add to this list, if you think you have an exception ask @deads2k
9896
"PinnedImages",

machineconfiguration/install.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ import (
55
"k8s.io/apimachinery/pkg/runtime/schema"
66

77
machineconfigurationv1 "github.com/openshift/api/machineconfiguration/v1"
8-
machineconfigurationv1alpha "github.com/openshift/api/machineconfiguration/v1alpha1"
98
)
109

1110
// GroupName defines the API group for machineconfiguration.
1211
const GroupName = "machineconfiguration.openshift.io"
1312

1413
var (
15-
SchemeBuilder = runtime.NewSchemeBuilder(machineconfigurationv1.Install, machineconfigurationv1alpha.Install)
14+
SchemeBuilder = runtime.NewSchemeBuilder(machineconfigurationv1.Install)
1615
// Install is a function which adds every version of this group to a scheme
1716
Install = SchemeBuilder.AddToScheme
1817
)
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
22
name: "MachineOSBuild"
33
crdName: machineosbuilds.machineconfiguration.openshift.io
4-
featureGate: OnClusterBuild
54
tests:
65
onCreate:
76
- name: Should be able to create a minimal MachineOSBuild
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
22
name: "MachineOSConfig"
33
crdName: machineosconfigs.machineconfiguration.openshift.io
4-
featureGate: OnClusterBuild
54
tests:
65
onCreate:
76
- name: Should be able to create a minimal MachineOSConfig

machineconfiguration/v1/types_machineosbuild.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
// +kubebuilder:resource:path=machineosbuilds,scope=Cluster
1212
// +kubebuilder:subresource:status
1313
// +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/2090
14-
// +openshift:enable:FeatureGate=OnClusterBuild
1514
// +openshift:file-pattern=cvoRunLevel=0000_80,operatorName=machine-config,operatorOrdering=01
1615
// +kubebuilder:metadata:labels=openshift.io/operator-managed=
1716
// +kubebuilder:printcolumn:name="Prepared",type="string",JSONPath=.status.conditions[?(@.type=="Prepared")].status

machineconfiguration/v1/types_machineosconfig.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
// +kubebuilder:resource:path=machineosconfigs,scope=Cluster
1212
// +kubebuilder:subresource:status
1313
// +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/2090
14-
// +openshift:enable:FeatureGate=OnClusterBuild
1514
// +openshift:file-pattern=cvoRunLevel=0000_80,operatorName=machine-config,operatorOrdering=01
1615
// +kubebuilder:metadata:labels=openshift.io/operator-managed=
1716

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,7 @@ machineosbuilds.machineconfiguration.openshift.io:
254254
CRDName: machineosbuilds.machineconfiguration.openshift.io
255255
Capability: ""
256256
Category: ""
257-
FeatureGates:
258-
- OnClusterBuild
257+
FeatureGates: []
259258
FilenameOperatorName: machine-config
260259
FilenameOperatorOrdering: "01"
261260
FilenameRunLevel: "0000_80"
@@ -286,8 +285,7 @@ machineosbuilds.machineconfiguration.openshift.io:
286285
type: date
287286
Scope: Cluster
288287
ShortNames: null
289-
TopLevelFeatureGates:
290-
- OnClusterBuild
288+
TopLevelFeatureGates: []
291289
Version: v1
292290

293291
machineosconfigs.machineconfiguration.openshift.io:
@@ -296,8 +294,7 @@ machineosconfigs.machineconfiguration.openshift.io:
296294
CRDName: machineosconfigs.machineconfiguration.openshift.io
297295
Capability: ""
298296
Category: ""
299-
FeatureGates:
300-
- OnClusterBuild
297+
FeatureGates: []
301298
FilenameOperatorName: machine-config
302299
FilenameOperatorOrdering: "01"
303300
FilenameRunLevel: "0000_80"
@@ -310,8 +307,7 @@ machineosconfigs.machineconfiguration.openshift.io:
310307
PrinterColumns: []
311308
Scope: Cluster
312309
ShortNames: null
313-
TopLevelFeatureGates:
314-
- OnClusterBuild
310+
TopLevelFeatureGates: []
315311
Version: v1
316312

317313
pinnedimagesets.machineconfiguration.openshift.io:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
api.openshift.io/filename-cvo-runlevel: "0000_80"
77
api.openshift.io/filename-operator: machine-config
88
api.openshift.io/filename-ordering: "01"
9-
feature-gate.release.openshift.io/OnClusterBuild: "true"
9+
feature-gate.release.openshift.io/: "true"
1010
labels:
1111
openshift.io/operator-managed: ""
1212
name: machineosbuilds.machineconfiguration.openshift.io

0 commit comments

Comments
 (0)