Merge pull request #5618 from jatinsu/OKD-mco-4.22-nightly-fix

openshift-merge-bot[bot] · web-flow · commit c9188a480b4a · 2026-02-04T13:56:50.000Z
NO-JIRA: Fix OSImageStream validating admission policies for OKD
diff --git a/pkg/operator/sync.go b/pkg/operator/sync.go
@@ -1186,7 +1186,8 @@ func (optr *Operator) syncMachineConfigController(config *renderConfig, _ *confi
 		},
 	}
 
-	if optr.fgHandler.Enabled(features.FeatureGateOSStreams) {
+	// Only deploy OS image stream validating admission policies when the feature is enabled and the cluster isn't OKD
+	if osimagestream.IsFeatureEnabled(optr.fgHandler) {
 		paths.validatingAdmissionPolicies = append(paths.validatingAdmissionPolicies, mccMachineConfigPoolOSImageStreamValidatingAdmissionPolicyPath)
 		paths.validatingAdmissionPolicyBindings = append(paths.validatingAdmissionPolicyBindings, mccMachineConfigPoolOSImageStreamValidatingAdmissionPolicyBindingPath)
 	}

Original file line number	Diff line number	Diff line change
`@@ -1186,7 +1186,8 @@ func (optr Operator) syncMachineConfigController(config renderConfig, _ *confi`
`1186`	`1186`	`},`
`1187`	`1187`	`}`
`1188`	`1188`
`1189`		`- if optr.fgHandler.Enabled(features.FeatureGateOSStreams) {`
	`1189`	`+ // Only deploy OS image stream validating admission policies when the feature is enabled and the cluster isn't OKD`
	`1190`	`+ if osimagestream.IsFeatureEnabled(optr.fgHandler) {`
`1190`	`1191`	`paths.validatingAdmissionPolicies = append(paths.validatingAdmissionPolicies, mccMachineConfigPoolOSImageStreamValidatingAdmissionPolicyPath)`
`1191`	`1192`	`paths.validatingAdmissionPolicyBindings = append(paths.validatingAdmissionPolicyBindings, mccMachineConfigPoolOSImageStreamValidatingAdmissionPolicyBindingPath)`
`1192`	`1193`	`}`