Fixes and additions pending & unpack path

Signed-off-by: Brett Tofel <[email protected]>

Author: bentito

api/v1alpha1/clusterextension_types.go

@@ -92,6 +92,7 @@ const (
 	TypePackageDeprecated = "PackageDeprecated"
 	TypeChannelDeprecated = "ChannelDeprecated"
 	TypeBundleDeprecated  = "BundleDeprecated"
+	TypeUnpacked          = "Unpacked"
 
 	ReasonErrorGettingClient = "ErrorGettingClient"
 	ReasonBundleLoadFailed   = "BundleLoadFailed"
@@ -101,9 +102,11 @@ const (
 	ReasonInstallationSucceeded     = "InstallationSucceeded"
 	ReasonResolutionFailed          = "ResolutionFailed"
 
-	ReasonSuccess       = "Success"
-	ReasonDeprecated    = "Deprecated"
-	ReasonUpgradeFailed = "UpgradeFailed"
+	ReasonSuccess               = "Success"
+	ReasonDeprecated            = "Deprecated"
+	ReasonUpgradeFailed         = "UpgradeFailed"
+	ReasonHasValidBundleUnknown = "HasValidBundleUnknown"
+	ReasonUnpackPending         = "UnpackPending"
 )
 
 func init() {
@@ -116,6 +119,7 @@ func init() {
 		TypePackageDeprecated,
 		TypeChannelDeprecated,
 		TypeBundleDeprecated,
+		TypeUnpacked,
 	)
 	// TODO(user): add Reasons from above
 	conditionsets.ConditionReasons = append(conditionsets.ConditionReasons,
@@ -128,6 +132,8 @@ func init() {
 		ReasonBundleLoadFailed,
 		ReasonErrorGettingClient,
 		ReasonInstallationStatusUnknown,
+		ReasonHasValidBundleUnknown,
+		ReasonUnpackPending,
 	)
 }
 

internal/controllers/clusterextension_controller.go

@@ -235,6 +235,8 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
 		setDeprecationStatusesUnknown(&ext.Status.Conditions, "deprecation checks have not been attempted as installation has failed", ext.GetGeneration())
 		return ctrl.Result{}, err
 	}
+	// set deprecation status after _successful_ resolution
+	SetDeprecationStatus(ext, bundle)
 
 	bundleVersion, err := bundle.Version()
 	if err != nil {
@@ -259,12 +261,17 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
 
 	switch unpackResult.State {
 	case rukpaksource.StatePending:
-		updateStatusUnpackPending(&ext.Status, unpackResult)
+		updateStatusUnpackPending(&ext.Status, unpackResult, ext.GetGeneration())
 		// There must be a limit to number of entries if status is stuck at
 		// unpack pending.
+		setHasValidBundleUnknown(&ext.Status.Conditions, "unpack pending", ext.GetGeneration())
+		setInstalledStatusConditionUnknown(&ext.Status.Conditions, "installation has not been attempted as unpack is pending", ext.GetGeneration())
+
 		return ctrl.Result{}, nil
 	case rukpaksource.StateUnpacking:
 		updateStatusUnpacking(&ext.Status, unpackResult)
+		setHasValidBundleUnknown(&ext.Status.Conditions, "unpack pending", ext.GetGeneration())
+		setInstalledStatusConditionUnknown(&ext.Status.Conditions, "installation has not been attempted as unpack is pending", ext.GetGeneration())
 		return ctrl.Result{}, nil
 	case rukpaksource.StateUnpacked:
 		// TODO: Add finalizer to clean the stored bundles, after https://github.com/operator-framework/rukpak/pull/897

internal/controllers/clusterextension_controller_test.go

@@ -243,6 +243,7 @@ func TestClusterExtensionChannelExistsNoVersion(t *testing.T) {
 	require.Equal(t, metav1.ConditionFalse, unpackedCond.Status)
 	require.Equal(t, rukpakv1alpha2.ReasonUnpackPending, unpackedCond.Reason)
 
+	verifyInvariants(ctx, t, reconciler.Client, clusterExtension)
 	require.NoError(t, cl.DeleteAllOf(ctx, &ocv1alpha1.ClusterExtension{}))
 }
 

internal/controllers/common_controller.go

@@ -46,6 +46,28 @@ func setResolvedStatusConditionSuccess(conditions *[]metav1.Condition, message s
 	})
 }
 
+// setInstalledStatusConditionUnknown sets the installed status condition to unknown.
+func setInstalledStatusConditionUnknown(conditions *[]metav1.Condition, message string, generation int64) {
+	apimeta.SetStatusCondition(conditions, metav1.Condition{
+		Type:               ocv1alpha1.TypeInstalled,
+		Status:             metav1.ConditionUnknown,
+		Reason:             ocv1alpha1.ReasonInstallationStatusUnknown,
+		Message:            message,
+		ObservedGeneration: generation,
+	})
+}
+
+// setHasValidBundleUnknown sets the installed status condition to unknown.
+func setHasValidBundleUnknown(conditions *[]metav1.Condition, message string, generation int64) {
+	apimeta.SetStatusCondition(conditions, metav1.Condition{
+		Type:               ocv1alpha1.TypeHasValidBundle,
+		Status:             metav1.ConditionUnknown,
+		Reason:             ocv1alpha1.ReasonHasValidBundleUnknown,
+		Message:            message,
+		ObservedGeneration: generation,
+	})
+}
+
 // setResolvedStatusConditionFailed sets the resolved status condition to failed.
 func setResolvedStatusConditionFailed(conditions *[]metav1.Condition, message string, generation int64) {
 	apimeta.SetStatusCondition(conditions, metav1.Condition{
@@ -111,13 +133,14 @@ func updateStatusUnpackFailing(status *ocv1alpha1.ClusterExtensionStatus, err er
 }
 
 // TODO: verify if we need to update the installBundle status or leave it as is.
-func updateStatusUnpackPending(status *ocv1alpha1.ClusterExtensionStatus, result *source.Result) {
+func updateStatusUnpackPending(status *ocv1alpha1.ClusterExtensionStatus, result *source.Result, generation int64) {
 	status.InstalledBundle = nil
 	meta.SetStatusCondition(&status.Conditions, metav1.Condition{
-		Type:    rukpakv1alpha2.TypeUnpacked,
-		Status:  metav1.ConditionFalse,
-		Reason:  rukpakv1alpha2.ReasonUnpackPending,
-		Message: result.Message,
+		Type:               rukpakv1alpha2.TypeUnpacked,
+		Status:             metav1.ConditionFalse,
+		Reason:             rukpakv1alpha2.ReasonUnpackPending,
+		Message:            result.Message,
+		ObservedGeneration: generation,
 	})
 }