Skip to content

OCPBUGS-72555: Restrict CPMS boot image configuration to only AWS, GCP and Azure platforms #5540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jan 29, 2026
Merged

OCPBUGS-72555: Restrict CPMS boot image configuration to only AWS, GCP and Azure platforms #5540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions manifests/machineconfigcontroller/update-bootimages-cpms-validatingadmissionpolicy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingAdmissionPolicy
metadata:
name: "managed-bootimages-cpms-platform-check"
spec:
failurePolicy: Fail
paramKind:
apiVersion: config.openshift.io/v1
kind: Infrastructure
matchConstraints:
matchPolicy: Equivalent
namespaceSelector: {}
objectSelector: {}
resourceRules:
- apiGroups: ["operator.openshift.io"]
apiVersions: ["v1"]
operations: ["CREATE","UPDATE"]
resources: ["machineconfigurations"]
scope: "*"
validations:
- expression: "!has(object.spec.managedBootImages) || !has(object.spec.managedBootImages.machineManagers) || !object.spec.managedBootImages.machineManagers.exists(m, m.resource == 'controlplanemachinesets') || params.status.platformStatus.type in ['GCP','AWS','Azure']"
message: "The control plane machineset boot image update feature is only supported on these platforms: GCP, AWS, Azure"
10 changes: 10 additions & 0 deletions ...ests/machineconfigcontroller/update-bootimages-cpms-validatingadmissionpolicybinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingAdmissionPolicyBinding
metadata:
name: "managed-bootimages-cpms-platform-check-binding"
spec:
policyName: "managed-bootimages-cpms-platform-check"
validationActions: [Deny]
paramRef:
name: "cluster"
parameterNotFoundAction: "Deny"
6 changes: 6 additions & 0 deletions pkg/operator/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ const (
mccMachineConfigPoolOSImageStreamValidatingAdmissionPolicyBindingPath = "manifests/machineconfigcontroller/machineconfigpool-osimagestream-reference-validatingadmissionpolicybinding.yaml"
mccIRIDeletionGuardValidatingAdmissionPolicyPath = "manifests/machineconfigcontroller/internalreleaseimage-deletion-guard-validatingadmissionpolicy.yaml"
mccIRIDeletionGuardValidatingAdmissionPolicyBindingPath = "manifests/machineconfigcontroller/internalreleaseimage-deletion-guard-validatingadmissionpolicybinding.yaml"
mccUpdateBootImagesCPMSValidatingAdmissionPolicyPath = "manifests/machineconfigcontroller/update-bootimages-cpms-validatingadmissionpolicy.yaml"
mccUpdateBootImagesCPMSValidatingAdmissionPolicyBindingPath = "manifests/machineconfigcontroller/update-bootimages-cpms-validatingadmissionpolicybinding.yaml"

// Machine OS Builder manifest paths
mobClusterRoleManifestPath = "manifests/machineosbuilder/clusterrole.yaml"
Expand Down Expand Up @@ -1188,6 +1190,10 @@ func (optr *Operator) syncMachineConfigController(config *renderConfig, _ *confi
paths.validatingAdmissionPolicies = append(paths.validatingAdmissionPolicies, mccMachineConfigPoolOSImageStreamValidatingAdmissionPolicyPath)
paths.validatingAdmissionPolicyBindings = append(paths.validatingAdmissionPolicyBindings, mccMachineConfigPoolOSImageStreamValidatingAdmissionPolicyBindingPath)
}
if optr.fgHandler.Enabled(features.FeatureGateManagedBootImagesCPMS) {
paths.validatingAdmissionPolicies = append(paths.validatingAdmissionPolicies, mccUpdateBootImagesCPMSValidatingAdmissionPolicyPath)
paths.validatingAdmissionPolicyBindings = append(paths.validatingAdmissionPolicyBindings, mccUpdateBootImagesCPMSValidatingAdmissionPolicyBindingPath)
}

if optr.fgHandler.Enabled(features.FeatureGateNoRegistryClusterInstall) {
// Only deploy the IRI deletion guard policy if the IRI resource actually exists
Expand Down