Remove ReasonUnpackPending/InstallationsStatusUnk

Signed-off-by: Brett Tofel <btofel@redhat.com>
operator-framework · Jul 2, 2024 · b6a1109 · b6a1109
1 parent 135cf59
commit b6a1109
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/api/v1alpha1/clusterextension_types.go b/api/v1alpha1/clusterextension_types.go
@@ -115,15 +115,13 @@ const (
 	ReasonErrorGettingClient = "ErrorGettingClient"
 	ReasonBundleLoadFailed   = "BundleLoadFailed"
 
-	ReasonInstallationFailed        = "InstallationFailed"
-	ReasonInstallationStatusUnknown = "InstallationStatusUnknown"
-	ReasonResolutionFailed          = "ResolutionFailed"
+	ReasonInstallationFailed = "InstallationFailed"
+	ReasonResolutionFailed   = "ResolutionFailed"
 
 	ReasonSuccess       = "Success"
 	ReasonDeprecated    = "Deprecated"
 	ReasonUpgradeFailed = "UpgradeFailed"
 
-	ReasonUnpackPending = "UnpackPending"
 	ReasonUnpackSuccess = "UnpackSuccess"
 	ReasonUnpackFailed  = "UnpackFailed"
 
@@ -150,8 +148,6 @@ func init() {
 		ReasonUpgradeFailed,
 		ReasonBundleLoadFailed,
 		ReasonErrorGettingClient,
-		ReasonInstallationStatusUnknown,
-		ReasonUnpackPending,
 		ReasonUnpackSuccess,
 		ReasonUnpackFailed,
 		ReasonErrorGettingReleaseState,

diff --git a/internal/controllers/clusterextension_controller.go b/internal/controllers/clusterextension_controller.go
@@ -273,7 +273,7 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
 
 	switch unpackResult.State {
 	case rukpaksource.StatePending:
-		setStatusUnpackPending(ext, unpackResult.Message)
+		setStatusInstallFalseUnpackFailed(ext, unpackResult.Message)
 		setInstalledStatusConditionInstalledFalse(ext, "installation has not been attempted as unpack is pending")
 
 		return ctrl.Result{}, nil

diff --git a/internal/controllers/clusterextension_controller_test.go b/internal/controllers/clusterextension_controller_test.go
@@ -184,7 +184,7 @@ func TestClusterExtensionChannelVersionExists(t *testing.T) {
 	unpackedCond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeUnpacked)
 	require.NotNil(t, unpackedCond)
 	require.Equal(t, metav1.ConditionFalse, unpackedCond.Status)
-	require.Equal(t, ocv1alpha1.ReasonUnpackPending, unpackedCond.Reason)
+	require.Equal(t, ocv1alpha1.ReasonUnpackFailed, unpackedCond.Reason)
 
 	require.NoError(t, cl.DeleteAllOf(ctx, &ocv1alpha1.ClusterExtension{}))
 }
@@ -242,7 +242,7 @@ func TestClusterExtensionChannelExistsNoVersion(t *testing.T) {
 	unpackedCond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeUnpacked)
 	require.NotNil(t, unpackedCond)
 	require.Equal(t, metav1.ConditionFalse, unpackedCond.Status)
-	require.Equal(t, ocv1alpha1.ReasonUnpackPending, unpackedCond.Reason)
+	require.Equal(t, ocv1alpha1.ReasonUnpackFailed, unpackedCond.Reason)
 
 	verifyInvariants(ctx, t, reconciler.Client, clusterExtension)
 	require.NoError(t, cl.DeleteAllOf(ctx, &ocv1alpha1.ClusterExtension{}))

diff --git a/internal/controllers/common_controller.go b/internal/controllers/common_controller.go
@@ -119,12 +119,12 @@ func setStatusUnpackFailed(ext *ocv1alpha1.ClusterExtension, message string) {
 }
 
 // TODO: verify if we need to update the installBundle status or leave it as is.
-func setStatusUnpackPending(ext *ocv1alpha1.ClusterExtension, message string) {
+func setStatusInstallFalseUnpackFailed(ext *ocv1alpha1.ClusterExtension, message string) {
 	ext.Status.InstalledBundle = nil
 	apimeta.SetStatusCondition(&ext.Status.Conditions, metav1.Condition{
 		Type:               ocv1alpha1.TypeUnpacked,
 		Status:             metav1.ConditionFalse,
-		Reason:             ocv1alpha1.ReasonUnpackPending,
+		Reason:             ocv1alpha1.ReasonUnpackFailed,
 		Message:            message,
 		ObservedGeneration: ext.GetGeneration(),
 	})