Skip to content

Commit e558a63

Browse files
committed
Decouple bundle unpacking and installed statuses
Signed-off-by: Brett Tofel <[email protected]>
1 parent 8f6ddb7 commit e558a63

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

internal/controllers/clusterextension_controller.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,7 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
278278
switch unpackResult.State {
279279
case rukpaksource.StatePending:
280280
setStatusInstallFalseUnpackFailed(ext, unpackResult.Message)
281-
setInstalledStatusConditionInstalledFalse(ext, "installation has not been attempted as unpack is pending")
282-
281+
ensureAllConditionsWithReason(ext, ocv1alpha1.ReasonUnpackFailed, "unpack pending")
283282
return ctrl.Result{}, nil
284283
case rukpaksource.StateUnpacked:
285284
// TODO: https://github.com/operator-framework/rukpak/pull/897 merged, add finalizer to clean the stored bundles

internal/controllers/common_controller.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,6 @@ func setResolvedStatusConditionSuccess(ext *ocv1alpha1.ClusterExtension, message
4343
})
4444
}
4545

46-
// setInstalledStatusConditionInstalledFalse sets the installed status condition to unknown.
47-
func setInstalledStatusConditionInstalledFalse(ext *ocv1alpha1.ClusterExtension, message string) {
48-
apimeta.SetStatusCondition(&ext.Status.Conditions, metav1.Condition{
49-
Type: ocv1alpha1.TypeInstalled,
50-
Status: metav1.ConditionFalse,
51-
Reason: ocv1alpha1.ReasonInstallationFailed,
52-
Message: message,
53-
ObservedGeneration: ext.GetGeneration(),
54-
})
55-
}
56-
5746
// setResolvedStatusConditionFailed sets the resolved status condition to failed.
5847
func setResolvedStatusConditionFailed(ext *ocv1alpha1.ClusterExtension, message string) {
5948
apimeta.SetStatusCondition(&ext.Status.Conditions, metav1.Condition{

0 commit comments

Comments
 (0)