Skip to content

Commit f678a7c

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

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
@@ -296,7 +296,7 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
296296

297297
switch unpackResult.State {
298298
case rukpaksource.StatePending:
299-
setStatusInstallFalseUnpackFailed(ext, unpackResult.Message)
299+
setStatusUnpackFailed(ext, unpackResult.Message)
300300
ensureAllConditionsWithReason(ext, ocv1alpha1.ReasonUnpackFailed, "unpack pending")
301301
return ctrl.Result{}, nil
302302
case rukpaksource.StateUnpacked:

Diff for: internal/controllers/common_controller.go

-10
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,6 @@ func setStatusUnpackFailed(ext *ocv1alpha1.ClusterExtension, message string) {
9898
})
9999
}
100100

101-
func setStatusInstallFalseUnpackFailed(ext *ocv1alpha1.ClusterExtension, message string) {
102-
apimeta.SetStatusCondition(&ext.Status.Conditions, metav1.Condition{
103-
Type: ocv1alpha1.TypeUnpacked,
104-
Status: metav1.ConditionFalse,
105-
Reason: ocv1alpha1.ReasonUnpackFailed,
106-
Message: message,
107-
ObservedGeneration: ext.GetGeneration(),
108-
})
109-
}
110-
111101
func setStatusUnpacked(ext *ocv1alpha1.ClusterExtension, message string) {
112102
apimeta.SetStatusCondition(&ext.Status.Conditions, metav1.Condition{
113103
Type: ocv1alpha1.TypeUnpacked,

0 commit comments

Comments
 (0)