Skip to content

OCPBUGS-64822: block upgrades for conflict non-default ClusterImagePolicy resources #5414

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

Open
wants to merge 2 commits into
base: release-4.20
Choose a base branch
from
Open

OCPBUGS-64822: block upgrades for conflict non-default ClusterImagePolicy resources #5414

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6203102
check ClusterImagePolicy conflicts only on default clusters
QiWang19 Nov 13, 2025
e285e21
featureset signal workaround
QiWang19 Nov 17, 2025
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
16 changes: 16 additions & 0 deletions pkg/operator/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,22 @@ func (optr *Operator) syncUpgradeableStatus(co *configv1.ClusterOperator) error
coStatusCondition.Reason = "ClusterOnCgroupV1"
coStatusCondition.Message = "Cluster is using deprecated cgroup v1 and is not upgradable. Please update the `CgroupMode` in the `nodes.config.openshift.io` object to 'v2'. Once upgraded, the cluster cannot be changed back to cgroup v1"
}

// Check for ClusterImagePolicy named "openshift" which conflicts with the cluster default ClusterImagePolicy object
// Only check for Default featureSet clusters allowing 4.20 ci techpreview builds upgrades
// Use SigstoreImageVerificationPKI as an featureset indicator: if it's disabled, the cluster is on Default feature set
// (SigstoreImageVerificationPKI is only enabled in TechPreview/DevPreview in 4.20, not in Default, and thefeature set changes won’t be backported, making this method stable for 4.20.).
// This avoids the API call to get the FeatureGate resource
if optr.fgHandler != nil && !optr.fgHandler.Enabled(features.FeatureGateSigstoreImageVerificationPKI) {
if _, err := optr.configClient.ConfigV1().ClusterImagePolicies().Get(context.TODO(), "openshift", metav1.GetOptions{}); err == nil {
coStatusCondition.Status = configv1.ConditionFalse
coStatusCondition.Reason = "ConflictingClusterImagePolicy"
coStatusCondition.Message = "ClusterImagePolicy resource named 'openshift' conflicts with the cluster default ClusterImagePolicy object and blocks upgrades. Please delete the 'openshift' ClusterImagePolicy resource and reapply it with a different name if needed"
} else if !apierrors.IsNotFound(err) {
return err
}
}

var degraded, interrupted bool
for _, pool := range pools {
interrupted = isPoolStatusConditionTrue(pool, mcfgv1.MachineConfigPoolBuildInterrupted)
Expand Down