Skip to content

Commit e5952e4

Browse files
committed
Remove unneeded unpack stage helper method
Signed-off-by: Brett Tofel <[email protected]>
1 parent 0306c9d commit e5952e4

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

Diff for: internal/controllers/clusterextension_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
273273

274274
switch unpackResult.State {
275275
case rukpaksource.StatePending:
276-
setStatusInstallFalseUnpackFailed(ext, unpackResult.Message)
276+
setStatusUnpackFailed(ext, unpackResult.Message)
277277
ensureAllConditionsWithReason(ext, ocv1alpha1.ReasonUnpackFailed, "unpack pending")
278278
return ctrl.Result{}, nil
279279
case rukpaksource.StateUnpacked:

Diff for: internal/controllers/common_controller.go

-10
Original file line numberDiff line numberDiff line change
@@ -107,16 +107,6 @@ func setStatusUnpackFailed(ext *ocv1alpha1.ClusterExtension, message string) {
107107
})
108108
}
109109

110-
func setStatusInstallFalseUnpackFailed(ext *ocv1alpha1.ClusterExtension, message string) {
111-
apimeta.SetStatusCondition(&ext.Status.Conditions, metav1.Condition{
112-
Type: ocv1alpha1.TypeUnpacked,
113-
Status: metav1.ConditionFalse,
114-
Reason: ocv1alpha1.ReasonUnpackFailed,
115-
Message: message,
116-
ObservedGeneration: ext.GetGeneration(),
117-
})
118-
}
119-
120110
func setStatusUnpacked(ext *ocv1alpha1.ClusterExtension, message string) {
121111
apimeta.SetStatusCondition(&ext.Status.Conditions, metav1.Condition{
122112
Type: ocv1alpha1.TypeUnpacked,

0 commit comments

Comments
 (0)