block upgrades for conflict non-default ClusterImagePolicy resources

Signed-off-by: Qi Wang <[email protected]>

Author: QiWang19

pkg/operator/status.go

@@ -282,10 +282,16 @@ func (optr *Operator) syncUpgradeableStatus(co *configv1.ClusterOperator) error
 	}
 
 	// Check for ClusterImagePolicy named "openshift" which conflicts with the cluster default ClusterImagePolicy object
-	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"
+	// Only block upgrades if it's a customer-created resource (not the internal-openshift-hosted default) for 4.20 techpreview ci builds
+	cip, err := optr.configClient.ConfigV1().ClusterImagePolicies().Get(context.TODO(), "openshift", metav1.GetOptions{})
+	if err == nil {
+		annotations := cip.GetAnnotations()
+		isClusterDefault := annotations != nil && annotations["exclude.release.openshift.io/internal-openshift-hosted"] == "true"
+		if !isClusterDefault {
+			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
 	}