From 68679321a8ce0ab5a22d6eb4473bd246c85125f6 Mon Sep 17 00:00:00 2001
From: Brett Tofel <btofel@redhat.com>
Date: Tue, 2 Jul 2024 06:20:30 -0400
Subject: [PATCH 01/13] Replace ReasonCreateDynamicWatchFailed w/
 ReasonInstallationFailed

Signed-off-by: Brett Tofel <btofel@redhat.com>
---
 api/v1alpha1/clusterextension_types.go              | 2 --
 internal/controllers/clusterextension_controller.go | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/api/v1alpha1/clusterextension_types.go b/api/v1alpha1/clusterextension_types.go
index c9760f958..bbb633663 100644
--- a/api/v1alpha1/clusterextension_types.go
+++ b/api/v1alpha1/clusterextension_types.go
@@ -129,7 +129,6 @@ const (
 	ReasonUnpackFailed  = "UnpackFailed"
 
 	ReasonErrorGettingReleaseState = "ErrorGettingReleaseState"
-	ReasonCreateDynamicWatchFailed = "CreateDynamicWatchFailed"
 )
 
 func init() {
@@ -158,7 +157,6 @@ func init() {
 		ReasonUnpackSuccess,
 		ReasonUnpackFailed,
 		ReasonErrorGettingReleaseState,
-		ReasonCreateDynamicWatchFailed,
 	)
 }
 
diff --git a/internal/controllers/clusterextension_controller.go b/internal/controllers/clusterextension_controller.go
index 3e3921741..196ca5c9a 100644
--- a/internal/controllers/clusterextension_controller.go
+++ b/internal/controllers/clusterextension_controller.go
@@ -378,7 +378,7 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
 
 	relObjects, err := util.ManifestObjects(strings.NewReader(rel.Manifest), fmt.Sprintf("%s-release-manifest", rel.Name))
 	if err != nil {
-		setInstalledStatusConditionFailed(ext, fmt.Sprintf("%s:%v", ocv1alpha1.ReasonCreateDynamicWatchFailed, err))
+		setInstalledStatusConditionFailed(ext, fmt.Sprintf("%s:%v", ocv1alpha1.ReasonInstallationFailed, err))
 		return ctrl.Result{}, err
 	}
 
@@ -402,7 +402,7 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
 			return nil
 		}(); err != nil {
 			ext.Status.InstalledBundle = nil
-			setInstalledStatusConditionFailed(ext, fmt.Sprintf("%s:%v", ocv1alpha1.ReasonCreateDynamicWatchFailed, err))
+			setInstalledStatusConditionFailed(ext, fmt.Sprintf("%s:%v", ocv1alpha1.ReasonInstallationFailed, err))
 			return ctrl.Result{}, err
 		}
 	}

From 3b2b39dbb0b4407419799b0efcf2e89f410ef18d Mon Sep 17 00:00:00 2001
From: Brett Tofel <btofel@redhat.com>
Date: Tue, 2 Jul 2024 06:23:14 -0400
Subject: [PATCH 02/13] Remove unused ReasonInstallationSucceeded

Signed-off-by: Brett Tofel <btofel@redhat.com>
---
 api/v1alpha1/clusterextension_types.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/api/v1alpha1/clusterextension_types.go b/api/v1alpha1/clusterextension_types.go
index bbb633663..72f767eeb 100644
--- a/api/v1alpha1/clusterextension_types.go
+++ b/api/v1alpha1/clusterextension_types.go
@@ -117,7 +117,6 @@ const (
 
 	ReasonInstallationFailed        = "InstallationFailed"
 	ReasonInstallationStatusUnknown = "InstallationStatusUnknown"
-	ReasonInstallationSucceeded     = "InstallationSucceeded"
 	ReasonResolutionFailed          = "ResolutionFailed"
 
 	ReasonSuccess       = "Success"
@@ -144,7 +143,6 @@ func init() {
 	)
 	// TODO(user): add Reasons from above
 	conditionsets.ConditionReasons = append(conditionsets.ConditionReasons,
-		ReasonInstallationSucceeded,
 		ReasonResolutionFailed,
 		ReasonInstallationFailed,
 		ReasonSuccess,

From 39b7933555d9366b8e2525f0dece0fab937d300d Mon Sep 17 00:00:00 2001
From: Brett Tofel <btofel@redhat.com>
Date: Tue, 2 Jul 2024 08:56:11 -0400
Subject: [PATCH 03/13] Drop usage of ConditionUnknown on Pending Install

Signed-off-by: Brett Tofel <btofel@redhat.com>
---
 internal/controllers/clusterextension_controller.go | 2 +-
 internal/controllers/common_controller.go           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/internal/controllers/clusterextension_controller.go b/internal/controllers/clusterextension_controller.go
index 45e538d2d..18108bf35 100644
--- a/internal/controllers/clusterextension_controller.go
+++ b/internal/controllers/clusterextension_controller.go
@@ -278,7 +278,7 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
 	switch unpackResult.State {
 	case rukpaksource.StatePending:
 		setStatusUnpackPending(ext, unpackResult.Message)
-		setInstalledStatusConditionUnknown(ext, "installation has not been attempted as unpack is pending")
+		setInstalledStatusConditionInstalledFalse(ext, "installation has not been attempted as unpack is pending")
 
 		return ctrl.Result{}, nil
 	case rukpaksource.StateUnpacked:
diff --git a/internal/controllers/common_controller.go b/internal/controllers/common_controller.go
index 8b07f4049..5b054f411 100644
--- a/internal/controllers/common_controller.go
+++ b/internal/controllers/common_controller.go
@@ -43,12 +43,12 @@ func setResolvedStatusConditionSuccess(ext *ocv1alpha1.ClusterExtension, message
 	})
 }
 
-// setInstalledStatusConditionUnknown sets the installed status condition to unknown.
-func setInstalledStatusConditionUnknown(ext *ocv1alpha1.ClusterExtension, message string) {
+// setInstalledStatusConditionInstalledFalse sets the installed status condition to unknown.
+func setInstalledStatusConditionInstalledFalse(ext *ocv1alpha1.ClusterExtension, message string) {
 	apimeta.SetStatusCondition(&ext.Status.Conditions, metav1.Condition{
 		Type:               ocv1alpha1.TypeInstalled,
-		Status:             metav1.ConditionUnknown,
-		Reason:             ocv1alpha1.ReasonInstallationStatusUnknown,
+		Status:             metav1.ConditionFalse,
+		Reason:             ocv1alpha1.ReasonInstallationFailed,
 		Message:            message,
 		ObservedGeneration: ext.GetGeneration(),
 	})

From f139524bf7a0ab798f2c6c0661f98f3150b6340d Mon Sep 17 00:00:00 2001
From: Brett Tofel <btofel@redhat.com>
Date: Tue, 2 Jul 2024 09:56:54 -0400
Subject: [PATCH 04/13] Remove ReasonUnpackPending/InstallationsStatusUnk

Signed-off-by: Brett Tofel <btofel@redhat.com>
---
 api/v1alpha1/clusterextension_types.go                   | 8 ++------
 internal/controllers/clusterextension_controller.go      | 2 +-
 internal/controllers/clusterextension_controller_test.go | 4 ++--
 internal/controllers/common_controller.go                | 4 ++--
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/api/v1alpha1/clusterextension_types.go b/api/v1alpha1/clusterextension_types.go
index ecd5ae23c..7c1684493 100644
--- a/api/v1alpha1/clusterextension_types.go
+++ b/api/v1alpha1/clusterextension_types.go
@@ -128,15 +128,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"
 
@@ -163,8 +161,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
index 18108bf35..7f4855649 100644
--- a/internal/controllers/clusterextension_controller.go
+++ b/internal/controllers/clusterextension_controller.go
@@ -277,7 +277,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
index a2adf08c9..0f2ee6ba8 100644
--- a/internal/controllers/clusterextension_controller_test.go
+++ b/internal/controllers/clusterextension_controller_test.go
@@ -194,7 +194,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{}))
 }
@@ -257,7 +257,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
index 5b054f411..f5a591700 100644
--- 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(),
 	})

From 9cadd962051d60109adcd835b8e3c2f2569ec61c Mon Sep 17 00:00:00 2001
From: Brett Tofel <btofel@redhat.com>
Date: Wed, 3 Jul 2024 07:30:03 -0400
Subject: [PATCH 05/13] Update related TODO in ClusterExtension controller

Signed-off-by: Brett Tofel <btofel@redhat.com>
---
 internal/controllers/clusterextension_controller.go | 3 +--
 internal/controllers/common_controller.go           | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/internal/controllers/clusterextension_controller.go b/internal/controllers/clusterextension_controller.go
index 7f4855649..7a313dcb3 100644
--- a/internal/controllers/clusterextension_controller.go
+++ b/internal/controllers/clusterextension_controller.go
@@ -282,8 +282,7 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
 
 		return ctrl.Result{}, nil
 	case rukpaksource.StateUnpacked:
-		// TODO: Add finalizer to clean the stored bundles, after https://github.com/operator-framework/rukpak/pull/897
-		// merges.
+		// TODO: https://github.com/operator-framework/rukpak/pull/897 merged, add finalizer to clean the stored bundles
 		if err := r.Storage.Store(ctx, ext, unpackResult.Bundle); err != nil {
 			setStatusUnpackFailed(ext, err.Error())
 			return ctrl.Result{}, err
diff --git a/internal/controllers/common_controller.go b/internal/controllers/common_controller.go
index f5a591700..640d557f3 100644
--- a/internal/controllers/common_controller.go
+++ b/internal/controllers/common_controller.go
@@ -118,7 +118,6 @@ func setStatusUnpackFailed(ext *ocv1alpha1.ClusterExtension, message string) {
 	})
 }
 
-// TODO: verify if we need to update the installBundle status or leave it as is.
 func setStatusInstallFalseUnpackFailed(ext *ocv1alpha1.ClusterExtension, message string) {
 	ext.Status.InstalledBundle = nil
 	apimeta.SetStatusCondition(&ext.Status.Conditions, metav1.Condition{

From 6bfa6c9e551f7150aa40cad1756fac318a3aa600 Mon Sep 17 00:00:00 2001
From: Brett Tofel <btofel@redhat.com>
Date: Wed, 3 Jul 2024 10:20:28 -0400
Subject: [PATCH 06/13] Rm InstalledStatus->nil on upack & add comment

Signed-off-by: Brett Tofel <btofel@redhat.com>
---
 api/v1alpha1/clusterextension_types.go    | 2 ++
 internal/controllers/common_controller.go | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/v1alpha1/clusterextension_types.go b/api/v1alpha1/clusterextension_types.go
index 7c1684493..0096ad101 100644
--- a/api/v1alpha1/clusterextension_types.go
+++ b/api/v1alpha1/clusterextension_types.go
@@ -173,6 +173,8 @@ type BundleMetadata struct {
 }
 
 // ClusterExtensionStatus defines the observed state of ClusterExtension
+// InstalledBundle should only be modified when a new bundle is successfully installed, that way if you've previously successfully installed a bundle before,
+// if an upgrade fails it is still appropriately communicated to you that there is still a bundle that is currently installed and owned by the ClusterExtension
 type ClusterExtensionStatus struct {
 	// +optional
 	InstalledBundle *BundleMetadata `json:"installedBundle,omitempty"`
diff --git a/internal/controllers/common_controller.go b/internal/controllers/common_controller.go
index 640d557f3..dff4aceb1 100644
--- a/internal/controllers/common_controller.go
+++ b/internal/controllers/common_controller.go
@@ -119,7 +119,6 @@ func setStatusUnpackFailed(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,

From 7567a42a42f4ed8b6567a9f63e6f9f260f567f62 Mon Sep 17 00:00:00 2001
From: Brett Tofel <btofel@redhat.com>
Date: Wed, 3 Jul 2024 10:50:14 -0400
Subject: [PATCH 07/13] Align CRD for added Go doc on InstalledBundle

Signed-off-by: Brett Tofel <btofel@redhat.com>
---
 api/v1alpha1/clusterextension_types.go                       | 5 ++---
 .../bases/olm.operatorframework.io_clusterextensions.yaml    | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/api/v1alpha1/clusterextension_types.go b/api/v1alpha1/clusterextension_types.go
index 0096ad101..46fe48822 100644
--- a/api/v1alpha1/clusterextension_types.go
+++ b/api/v1alpha1/clusterextension_types.go
@@ -172,9 +172,8 @@ type BundleMetadata struct {
 	Version string `json:"version"`
 }
 
-// ClusterExtensionStatus defines the observed state of ClusterExtension
-// InstalledBundle should only be modified when a new bundle is successfully installed, that way if you've previously successfully installed a bundle before,
-// if an upgrade fails it is still appropriately communicated to you that there is still a bundle that is currently installed and owned by the ClusterExtension
+// ClusterExtensionStatus defines the observed state of ClusterExtension.
+// InstalledBundle should only be modified when a new bundle is successfully installed. This ensures that if you've previously successfully installed a bundle before, and an upgrade fails, it is still appropriately communicated to you that there is still a bundle that is currently installed and owned by the ClusterExtension.
 type ClusterExtensionStatus struct {
 	// +optional
 	InstalledBundle *BundleMetadata `json:"installedBundle,omitempty"`
diff --git a/config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml b/config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml
index 9b92a3045..2509f4ff3 100644
--- a/config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml
+++ b/config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml
@@ -113,7 +113,9 @@ spec:
             - serviceAccount
             type: object
           status:
-            description: ClusterExtensionStatus defines the observed state of ClusterExtension
+            description: |-
+              ClusterExtensionStatus defines the observed state of ClusterExtension.
+              InstalledBundle should only be modified when a new bundle is successfully installed. This ensures that if you've previously successfully installed a bundle before, and an upgrade fails, it is still appropriately communicated to you that there is still a bundle that is currently installed and owned by the ClusterExtension.
             properties:
               conditions:
                 items:

From bd5c8aff6a191b1546b463e2777ac34205320794 Mon Sep 17 00:00:00 2001
From: Brett Tofel <btofel@redhat.com>
Date: Mon, 8 Jul 2024 07:50:33 -0400
Subject: [PATCH 08/13] Move comment on InstalledBundle field

Signed-off-by: Brett Tofel <btofel@redhat.com>
---
 api/v1alpha1/clusterextension_types.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/api/v1alpha1/clusterextension_types.go b/api/v1alpha1/clusterextension_types.go
index 46fe48822..c88cb7add 100644
--- a/api/v1alpha1/clusterextension_types.go
+++ b/api/v1alpha1/clusterextension_types.go
@@ -173,8 +173,10 @@ type BundleMetadata struct {
 }
 
 // ClusterExtensionStatus defines the observed state of ClusterExtension.
-// InstalledBundle should only be modified when a new bundle is successfully installed. This ensures that if you've previously successfully installed a bundle before, and an upgrade fails, it is still appropriately communicated to you that there is still a bundle that is currently installed and owned by the ClusterExtension.
 type ClusterExtensionStatus struct {
+	// InstalledBundle should only be modified when a new bundle is successfully installed. This ensures that if there
+	//  is a previously successfully installed a bundle, and an upgrade fails, it is still communicated that there is
+	//  still a bundle that is currently installed and owned by the ClusterExtension.
 	// +optional
 	InstalledBundle *BundleMetadata `json:"installedBundle,omitempty"`
 	// +optional

From 8f6ddb7aa5bacdf4bcf34d275b7e600325cfa590 Mon Sep 17 00:00:00 2001
From: Brett Tofel <btofel@redhat.com>
Date: Mon, 8 Jul 2024 08:07:49 -0400
Subject: [PATCH 09/13] Commit manifest changes for godoc change

Signed-off-by: Brett Tofel <btofel@redhat.com>
---
 .../bases/olm.operatorframework.io_clusterextensions.yaml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml b/config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml
index 2509f4ff3..24cdf64af 100644
--- a/config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml
+++ b/config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml
@@ -113,9 +113,7 @@ spec:
             - serviceAccount
             type: object
           status:
-            description: |-
-              ClusterExtensionStatus defines the observed state of ClusterExtension.
-              InstalledBundle should only be modified when a new bundle is successfully installed. This ensures that if you've previously successfully installed a bundle before, and an upgrade fails, it is still appropriately communicated to you that there is still a bundle that is currently installed and owned by the ClusterExtension.
+            description: ClusterExtensionStatus defines the observed state of ClusterExtension.
             properties:
               conditions:
                 items:
@@ -190,6 +188,10 @@ spec:
                 - type
                 x-kubernetes-list-type: map
               installedBundle:
+                description: |-
+                  InstalledBundle should only be modified when a new bundle is successfully installed. This ensures that if there
+                   is a previously successfully installed a bundle, and an upgrade fails, it is still communicated that there is
+                   still a bundle that is currently installed and owned by the ClusterExtension.
                 properties:
                   name:
                     type: string

From e558a635231f1324bb0410e6285e5bff0f7f29d8 Mon Sep 17 00:00:00 2001
From: Brett Tofel <btofel@redhat.com>
Date: Mon, 8 Jul 2024 14:30:25 -0400
Subject: [PATCH 10/13] Decouple bundle unpacking and installed statuses

Signed-off-by: Brett Tofel <btofel@redhat.com>
---
 internal/controllers/clusterextension_controller.go |  3 +--
 internal/controllers/common_controller.go           | 11 -----------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/internal/controllers/clusterextension_controller.go b/internal/controllers/clusterextension_controller.go
index 7a313dcb3..3858a124f 100644
--- a/internal/controllers/clusterextension_controller.go
+++ b/internal/controllers/clusterextension_controller.go
@@ -278,8 +278,7 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
 	switch unpackResult.State {
 	case rukpaksource.StatePending:
 		setStatusInstallFalseUnpackFailed(ext, unpackResult.Message)
-		setInstalledStatusConditionInstalledFalse(ext, "installation has not been attempted as unpack is pending")
-
+		ensureAllConditionsWithReason(ext, ocv1alpha1.ReasonUnpackFailed, "unpack pending")
 		return ctrl.Result{}, nil
 	case rukpaksource.StateUnpacked:
 		// TODO: https://github.com/operator-framework/rukpak/pull/897 merged, add finalizer to clean the stored bundles
diff --git a/internal/controllers/common_controller.go b/internal/controllers/common_controller.go
index dff4aceb1..66b271862 100644
--- a/internal/controllers/common_controller.go
+++ b/internal/controllers/common_controller.go
@@ -43,17 +43,6 @@ func setResolvedStatusConditionSuccess(ext *ocv1alpha1.ClusterExtension, message
 	})
 }
 
-// setInstalledStatusConditionInstalledFalse sets the installed status condition to unknown.
-func setInstalledStatusConditionInstalledFalse(ext *ocv1alpha1.ClusterExtension, message string) {
-	apimeta.SetStatusCondition(&ext.Status.Conditions, metav1.Condition{
-		Type:               ocv1alpha1.TypeInstalled,
-		Status:             metav1.ConditionFalse,
-		Reason:             ocv1alpha1.ReasonInstallationFailed,
-		Message:            message,
-		ObservedGeneration: ext.GetGeneration(),
-	})
-}
-
 // setResolvedStatusConditionFailed sets the resolved status condition to failed.
 func setResolvedStatusConditionFailed(ext *ocv1alpha1.ClusterExtension, message string) {
 	apimeta.SetStatusCondition(&ext.Status.Conditions, metav1.Condition{

From e6d0ea9fe874eec921800ec1be372ff9cd439dc2 Mon Sep 17 00:00:00 2001
From: Brett Tofel <btofel@redhat.com>
Date: Tue, 9 Jul 2024 04:52:49 -0400
Subject: [PATCH 11/13] Remove unneeded unpack stage helper method

Signed-off-by: Brett Tofel <btofel@redhat.com>
---
 internal/controllers/clusterextension_controller.go |  2 +-
 internal/controllers/common_controller.go           | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/internal/controllers/clusterextension_controller.go b/internal/controllers/clusterextension_controller.go
index 3858a124f..6d673e110 100644
--- a/internal/controllers/clusterextension_controller.go
+++ b/internal/controllers/clusterextension_controller.go
@@ -277,7 +277,7 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
 
 	switch unpackResult.State {
 	case rukpaksource.StatePending:
-		setStatusInstallFalseUnpackFailed(ext, unpackResult.Message)
+		setStatusUnpackFailed(ext, unpackResult.Message)
 		ensureAllConditionsWithReason(ext, ocv1alpha1.ReasonUnpackFailed, "unpack pending")
 		return ctrl.Result{}, nil
 	case rukpaksource.StateUnpacked:
diff --git a/internal/controllers/common_controller.go b/internal/controllers/common_controller.go
index 66b271862..61cf0a950 100644
--- a/internal/controllers/common_controller.go
+++ b/internal/controllers/common_controller.go
@@ -107,16 +107,6 @@ func setStatusUnpackFailed(ext *ocv1alpha1.ClusterExtension, message string) {
 	})
 }
 
-func setStatusInstallFalseUnpackFailed(ext *ocv1alpha1.ClusterExtension, message string) {
-	apimeta.SetStatusCondition(&ext.Status.Conditions, metav1.Condition{
-		Type:               ocv1alpha1.TypeUnpacked,
-		Status:             metav1.ConditionFalse,
-		Reason:             ocv1alpha1.ReasonUnpackFailed,
-		Message:            message,
-		ObservedGeneration: ext.GetGeneration(),
-	})
-}
-
 func setStatusUnpacked(ext *ocv1alpha1.ClusterExtension, message string) {
 	apimeta.SetStatusCondition(&ext.Status.Conditions, metav1.Condition{
 		Type:               ocv1alpha1.TypeUnpacked,

From 630d8c2f2da3dbde8f15c2aa1add12339f838022 Mon Sep 17 00:00:00 2001
From: Brett Tofel <btofel@redhat.com>
Date: Wed, 10 Jul 2024 10:45:50 -0400
Subject: [PATCH 12/13] Reorganize reconciler()

Preserve installedBundle on error, report partial progress, use "Progressing" status.
Modularize into helper functions.
Use Helm secret as source of truth for installed bundle.
Update status at each step, clear "Progressing" on success/match.

Signed-off-by: Brett Tofel <btofel@redhat.com>
---
 api/v1alpha1/clusterextension_types.go        |   8 +-
 go.mod                                        |   2 +-
 .../clusterextension_controller.go            | 323 +++++++++++-------
 internal/controllers/common_controller.go     |  16 +
 4 files changed, 215 insertions(+), 134 deletions(-)

diff --git a/api/v1alpha1/clusterextension_types.go b/api/v1alpha1/clusterextension_types.go
index c88cb7add..85fe90d55 100644
--- a/api/v1alpha1/clusterextension_types.go
+++ b/api/v1alpha1/clusterextension_types.go
@@ -124,12 +124,14 @@ const (
 	TypeChannelDeprecated = "ChannelDeprecated"
 	TypeBundleDeprecated  = "BundleDeprecated"
 	TypeUnpacked          = "Unpacked"
+	TypeProgressing       = "Progressing"
 
 	ReasonErrorGettingClient = "ErrorGettingClient"
 	ReasonBundleLoadFailed   = "BundleLoadFailed"
 
-	ReasonInstallationFailed = "InstallationFailed"
-	ReasonResolutionFailed   = "ResolutionFailed"
+	ReasonInstallationFailed     = "InstallationFailed"
+	ReasonInstallationInProgress = "InstallationInProgress"
+	ReasonResolutionFailed       = "ResolutionFailed"
 
 	ReasonSuccess       = "Success"
 	ReasonDeprecated    = "Deprecated"
@@ -151,6 +153,7 @@ func init() {
 		TypeChannelDeprecated,
 		TypeBundleDeprecated,
 		TypeUnpacked,
+		TypeProgressing,
 	)
 	// TODO(user): add Reasons from above
 	conditionsets.ConditionReasons = append(conditionsets.ConditionReasons,
@@ -164,6 +167,7 @@ func init() {
 		ReasonUnpackSuccess,
 		ReasonUnpackFailed,
 		ReasonErrorGettingReleaseState,
+		ReasonInstallationInProgress,
 	)
 }
 
diff --git a/go.mod b/go.mod
index 600a75691..008fb7f3a 100644
--- a/go.mod
+++ b/go.mod
@@ -7,6 +7,7 @@ toolchain go1.22.2
 require (
 	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/blang/semver/v4 v4.0.0
+	github.com/go-git/go-billy/v5 v5.5.0
 	github.com/go-logr/logr v1.4.2
 	github.com/google/go-cmp v0.6.0
 	github.com/operator-framework/api v0.26.0
@@ -112,7 +113,6 @@ require (
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-errors/errors v1.4.2 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
-	github.com/go-git/go-billy/v5 v5.5.0 // indirect
 	github.com/go-git/go-git/v5 v5.12.0 // indirect
 	github.com/go-gorp/gorp/v3 v3.1.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
diff --git a/internal/controllers/clusterextension_controller.go b/internal/controllers/clusterextension_controller.go
index 6d673e110..c4f4417b6 100644
--- a/internal/controllers/clusterextension_controller.go
+++ b/internal/controllers/clusterextension_controller.go
@@ -212,47 +212,30 @@ func checkForUnexpectedFieldChange(a, b ocv1alpha1.ClusterExtension) bool {
 */
 //nolint:unparam
 func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alpha1.ClusterExtension) (ctrl.Result, error) {
-	finalizeResult, err := r.Finalizers.Finalize(ctx, ext)
-	if err != nil {
-		// TODO: For now, this error handling follows the pattern of other error handling.
-		//  Namely: zero just about everything out, throw our hands up, and return an error.
-		//  This is not ideal, and we should consider a more nuanced approach that resolves
-		//  as much status as possible before returning, or at least keeps previous state if
-		//  it is properly labeled with its observed generation.
-		ext.Status.ResolvedBundle = nil
-		ext.Status.InstalledBundle = nil
-		setResolvedStatusConditionFailed(ext, err.Error())
-		ensureAllConditionsWithReason(ext, ocv1alpha1.ReasonResolutionFailed, err.Error())
-		return ctrl.Result{}, err
-	}
-	if finalizeResult.Updated || finalizeResult.StatusUpdated {
-		// On create: make sure the finalizer is applied before we do anything
-		// On delete: make sure we do nothing after the finalizer is removed
-		return ctrl.Result{}, nil
+	log := log.FromContext(ctx)
+
+	// 1. Handle Finalization
+	if result, err := r.handleFinalization(ctx, ext); err != nil || result.Requeue {
+		return result, err
 	}
 
-	// run resolution
-	bundle, err := r.resolve(ctx, *ext)
+	// 2. Resolve Bundle
+	bundle, err := r.resolveBundle(ctx, ext)
 	if err != nil {
-		// Note: We don't distinguish between resolution-specific errors and generic errors
-		ext.Status.ResolvedBundle = nil
-		ext.Status.InstalledBundle = nil
 		setResolvedStatusConditionFailed(ext, err.Error())
 		ensureAllConditionsWithReason(ext, ocv1alpha1.ReasonResolutionFailed, err.Error())
 		return ctrl.Result{}, err
 	}
 
-	if err := r.validateBundle(bundle); err != nil {
-		ext.Status.ResolvedBundle = nil
-		ext.Status.InstalledBundle = nil
+	// 3. Validate and Check Deprecation
+	if err := r.validateAndCheckDeprecation(bundle, ext); err != nil {
 		setResolvedStatusConditionFailed(ext, err.Error())
 		setInstalledStatusConditionFailed(ext, err.Error())
 		setDeprecationStatusesUnknown(ext, "deprecation checks have not been attempted as installation has failed")
 		return ctrl.Result{}, err
 	}
-	// set deprecation status after _successful_ resolution
-	SetDeprecationStatus(ext, bundle)
 
+	// 4. Get Bundle Version
 	bundleVersion, err := bundle.Version()
 	if err != nil {
 		ext.Status.ResolvedBundle = nil
@@ -262,43 +245,30 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
 		return ctrl.Result{}, err
 	}
 
-	ext.Status.ResolvedBundle = bundleMetadataFor(bundle)
-	setResolvedStatusConditionSuccess(ext, fmt.Sprintf("resolved to %q", bundle.Image))
-
-	// Generate a BundleDeployment from the ClusterExtension to Unpack.
-	// Note: The BundleDeployment here is not a k8s API, its a simple Go struct which
-	// necessary embedded values.
-	bd := r.generateBundleDeploymentForUnpack(ctx, bundle.Image, ext)
-	unpackResult, err := r.Unpacker.Unpack(ctx, bd)
+	// 5. Get Installed Bundle
+	installedBundle, err := r.InstalledBundleGetter.GetInstalledBundle(ctx, ext)
 	if err != nil {
-		setStatusUnpackFailed(ext, err.Error())
-		return ctrl.Result{}, err
+		log.Error(err, "Error determining installed bundle, continuing reconciliation")
 	}
 
-	switch unpackResult.State {
-	case rukpaksource.StatePending:
-		setStatusUnpackFailed(ext, unpackResult.Message)
-		ensureAllConditionsWithReason(ext, ocv1alpha1.ReasonUnpackFailed, "unpack pending")
-		return ctrl.Result{}, nil
-	case rukpaksource.StateUnpacked:
-		// TODO: https://github.com/operator-framework/rukpak/pull/897 merged, add finalizer to clean the stored bundles
-		if err := r.Storage.Store(ctx, ext, unpackResult.Bundle); err != nil {
-			setStatusUnpackFailed(ext, err.Error())
-			return ctrl.Result{}, err
-		}
-		setStatusUnpacked(ext, fmt.Sprintf("unpack successful: %v", unpackResult.Message))
-	default:
-		setStatusUnpackFailed(ext, "unexpected unpack status")
-		// We previously exit with a failed status if error is not nil.
-		return ctrl.Result{}, fmt.Errorf("unexpected unpack status: %v", unpackResult.Message)
+	// 6. Update Resolved Bundle Status
+	ext.Status.ResolvedBundle = bundleMetadataFor(bundle)
+	setResolvedStatusConditionSuccess(ext, fmt.Sprintf("resolved to %q", bundle.Image))
+
+	// 7. Unpack Bundle
+	if result, err := r.unpackBundle(ctx, ext, bundle); err != nil || result.Requeue {
+		return result, err
 	}
 
+	// 8. Load Bundle from Storage
 	bundleFS, err := r.Storage.Load(ctx, ext)
 	if err != nil {
 		setInstalledStatusConditionFailed(ext, err.Error())
 		return ctrl.Result{}, err
 	}
 
+	// 9. Handle Bundle and Get Action Client
+	bd := r.generateBundleDeploymentForUnpack(ctx, bundle.Image, ext)
 	chrt, values, err := r.Handler.Handle(ctx, bundleFS, bd)
 	if err != nil {
 		setInstalledStatusConditionFailed(ext, err.Error())
@@ -312,6 +282,7 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
 		return ctrl.Result{}, err
 	}
 
+	// 10. Set up postrenderer
 	post := &postrenderer{
 		labels: map[string]string{
 			labels.OwnerKindKey:     ocv1alpha1.ClusterExtensionKind,
@@ -322,104 +293,71 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
 		},
 	}
 
+	// 11. Determine Release State and Handle Progressing Status
 	rel, desiredRel, state, err := r.getReleaseState(ac, ext, chrt, values, post)
 	if err != nil {
 		setInstalledStatusConditionFailed(ext, fmt.Sprintf("%s:%v", ocv1alpha1.ReasonErrorGettingReleaseState, err))
 		return ctrl.Result{}, err
 	}
 
-	for _, preflight := range r.Preflights {
-		if ext.Spec.Preflight != nil && ext.Spec.Preflight.CRDUpgradeSafety != nil {
-			if _, ok := preflight.(*crdupgradesafety.Preflight); ok && ext.Spec.Preflight.CRDUpgradeSafety.Disabled {
-				// Skip this preflight check because it is of type *crdupgradesafety.Preflight and the CRD Upgrade Safety
-				// preflight check has been disabled
-				continue
-			}
-		}
-		switch state {
-		case stateNeedsInstall:
-			err := preflight.Install(ctx, desiredRel)
-			if err != nil {
-				setInstalledStatusConditionFailed(ext, fmt.Sprintf("%s:%v", ocv1alpha1.ReasonInstallationFailed, err))
-				return ctrl.Result{}, err
-			}
-		case stateNeedsUpgrade:
-			err := preflight.Upgrade(ctx, desiredRel)
-			if err != nil {
-				setInstalledStatusConditionFailed(ext, fmt.Sprintf("%s:%v", ocv1alpha1.ReasonInstallationFailed, err))
-				return ctrl.Result{}, err
-			}
-		}
+	// Check if the resolved bundle is different from the installed bundle
+	if installedBundle != nil && bundleVersion.String() != installedBundle.Version {
+		setInstalledStatusConditionProgressing(ext, "New version resolved, installation in progress")
+		ext.Status.InstalledBundle = installedBundle // Keep the old bundle in status
+	} else {
+		// If they are the same, or no bundle is installed, update the status and clear Progressing
+		ext.Status.InstalledBundle = bundleMetadataFor(bundle)
+		clearInstalledStatusConditionProgressing(ext) // Clear the Progressing condition
 	}
 
-	switch state {
-	case stateNeedsInstall:
-		rel, err = ac.Install(ext.GetName(), ext.Spec.InstallNamespace, chrt, values, func(install *action.Install) error {
-			install.CreateNamespace = false
-			install.Labels = map[string]string{labels.BundleNameKey: bundle.Name, labels.PackageNameKey: bundle.Package, labels.BundleVersionKey: bundleVersion.String()}
-			return nil
-		}, helmclient.AppendInstallPostRenderer(post))
-		if err != nil {
-			setInstalledStatusConditionFailed(ext, fmt.Sprintf("%s:%v", ocv1alpha1.ReasonInstallationFailed, err))
-			return ctrl.Result{}, err
-		}
-	case stateNeedsUpgrade:
-		rel, err = ac.Upgrade(ext.GetName(), ext.Spec.InstallNamespace, chrt, values, func(upgrade *action.Upgrade) error {
-			upgrade.MaxHistory = maxHelmReleaseHistory
-			upgrade.Labels = map[string]string{labels.BundleNameKey: bundle.Name, labels.PackageNameKey: bundle.Package, labels.BundleVersionKey: bundleVersion.String()}
-			return nil
-		}, helmclient.AppendUpgradePostRenderer(post))
-		if err != nil {
-			setInstalledStatusConditionFailed(ext, fmt.Sprintf("%s:%v", ocv1alpha1.ReasonUpgradeFailed, err))
-			return ctrl.Result{}, err
-		}
-	case stateUnchanged:
-		if err := ac.Reconcile(rel); err != nil {
-			setInstalledStatusConditionFailed(ext, fmt.Sprintf("%s:%v", ocv1alpha1.ReasonResolutionFailed, err))
-			return ctrl.Result{}, err
-		}
-	default:
-		return ctrl.Result{}, fmt.Errorf("unexpected release state %q", state)
+	// 12. Preflight Checks
+	if err := r.runPreflightChecks(ctx, ext, state, desiredRel); err != nil {
+		return ctrl.Result{}, err
 	}
 
-	relObjects, err := util.ManifestObjects(strings.NewReader(rel.Manifest), fmt.Sprintf("%s-release-manifest", rel.Name))
+	// 13. Install or Upgrade
+	rel, err = r.installOrUpgrade(state, ac, ext, chrt, values, post, rel)
 	if err != nil {
-		setInstalledStatusConditionFailed(ext, fmt.Sprintf("%s:%v", ocv1alpha1.ReasonInstallationFailed, err))
+		setInstalledStatusConditionFailed(ext, err.Error()) // Set detailed error message
 		return ctrl.Result{}, err
 	}
 
-	for _, obj := range relObjects {
-		if err := func() error {
-			r.dynamicWatchMutex.Lock()
-			defer r.dynamicWatchMutex.Unlock()
+	// 14. Reconcile Release
+	if err := ac.Reconcile(rel); err != nil {
+		setInstalledStatusConditionFailed(ext, fmt.Sprintf("%s:%v", ocv1alpha1.ReasonResolutionFailed, err))
+		return ctrl.Result{}, err
+	}
 
-			_, isWatched := r.dynamicWatchGVKs[obj.GetObjectKind().GroupVersionKind()]
-			if !isWatched {
-				if err := r.controller.Watch(
-					source.Kind(r.cache,
-						obj,
-						crhandler.EnqueueRequestForOwner(r.Scheme(), r.RESTMapper(), ext, crhandler.OnlyControllerOwner()),
-					),
-				); err != nil {
-					return err
-				}
-				r.dynamicWatchGVKs[obj.GetObjectKind().GroupVersionKind()] = sets.Empty{}
-			}
-			return nil
-		}(); err != nil {
-			ext.Status.InstalledBundle = nil
-			setInstalledStatusConditionFailed(ext, fmt.Sprintf("%s:%v", ocv1alpha1.ReasonInstallationFailed, err))
-			return ctrl.Result{}, err
-		}
+	// 15. Watch Dynamically Created Resources
+	if err := r.watchDynamicResources(ctx, ext, rel); err != nil {
+		setInstalledStatusConditionFailed(ext, fmt.Sprintf("%s:%v", ocv1alpha1.ReasonInstallationFailed, err))
+		return ctrl.Result{}, err
 	}
-	ext.Status.InstalledBundle = bundleMetadataFor(bundle)
+
+	// 16. Final Status Update
 	setInstalledStatusConditionSuccess(ext, fmt.Sprintf("Instantiated bundle %s successfully", ext.GetName()))
 
 	return ctrl.Result{}, nil
 }
 
-// resolve returns a Bundle from the catalog that needs to get installed on the cluster.
-func (r *ClusterExtensionReconciler) resolve(ctx context.Context, ext ocv1alpha1.ClusterExtension) (*catalogmetadata.Bundle, error) {
+// handleFinalization manages finalizer logic.
+func (r *ClusterExtensionReconciler) handleFinalization(ctx context.Context, ext *ocv1alpha1.ClusterExtension) (ctrl.Result, error) {
+	finalizeResult, err := r.Finalizers.Finalize(ctx, ext)
+	if err != nil {
+		ext.Status.ResolvedBundle = nil
+		ext.Status.InstalledBundle = nil
+		setResolvedStatusConditionFailed(ext, err.Error())
+		ensureAllConditionsWithReason(ext, ocv1alpha1.ReasonResolutionFailed, err.Error())
+		return ctrl.Result{}, err
+	}
+	if finalizeResult.Updated || finalizeResult.StatusUpdated {
+		return ctrl.Result{}, nil // Exit early if finalizer was changed
+	}
+	return ctrl.Result{}, nil
+}
+
+// resolveBundle resolves the bundle based on the ClusterExtension spec.
+func (r *ClusterExtensionReconciler) resolveBundle(ctx context.Context, ext *ocv1alpha1.ClusterExtension) (*catalogmetadata.Bundle, error) {
 	packageName := ext.Spec.PackageName
 	channelName := ext.Spec.Channel
 	versionRange := ext.Spec.Version
@@ -429,7 +367,7 @@ func (r *ClusterExtensionReconciler) resolve(ctx context.Context, ext ocv1alpha1
 		return nil, fmt.Errorf("error fetching bundles: %w", err)
 	}
 
-	installedBundle, err := r.InstalledBundleGetter.GetInstalledBundle(ctx, &ext)
+	installedBundle, err := r.InstalledBundleGetter.GetInstalledBundle(ctx, ext)
 	if err != nil {
 		return nil, err
 	}
@@ -492,6 +430,99 @@ func (r *ClusterExtensionReconciler) resolve(ctx context.Context, ext ocv1alpha1
 	return resultSet[0], nil
 }
 
+// validateAndCheckDeprecation validates the bundle and checks for deprecation.
+func (r *ClusterExtensionReconciler) validateAndCheckDeprecation(bundle *catalogmetadata.Bundle, ext *ocv1alpha1.ClusterExtension) error {
+	if err := r.validateBundle(bundle); err != nil {
+		return err
+	}
+	SetDeprecationStatus(ext, bundle)
+	return nil
+}
+
+func (r *ClusterExtensionReconciler) unpackBundle(ctx context.Context, ext *ocv1alpha1.ClusterExtension, bundle *catalogmetadata.Bundle) (ctrl.Result, error) {
+	// Generate a BundleDeployment from the ClusterExtension to Unpack
+	bd := r.generateBundleDeploymentForUnpack(ctx, bundle.Image, ext)
+	unpackResult, err := r.Unpacker.Unpack(ctx, bd)
+	if err != nil {
+		setStatusUnpackFailed(ext, err.Error())
+		return ctrl.Result{}, err
+	}
+
+	switch unpackResult.State {
+	case rukpaksource.StatePending:
+		setStatusUnpackFailed(ext, unpackResult.Message)
+		ensureAllConditionsWithReason(ext, ocv1alpha1.ReasonUnpackFailed, "unpack pending")
+		return ctrl.Result{}, nil // Don't requeue immediately if pending
+	case rukpaksource.StateUnpacked:
+		// TODO: Add finalizer to clean the stored bundles after https://github.com/operator-framework/rukpak/pull/897 is merged
+		if err := r.Storage.Store(ctx, ext, unpackResult.Bundle); err != nil {
+			setStatusUnpackFailed(ext, err.Error())
+			return ctrl.Result{}, err
+		}
+		setStatusUnpacked(ext, fmt.Sprintf("unpack successful: %v", unpackResult.Message))
+	default:
+		setStatusUnpackFailed(ext, "unexpected unpack status")
+		return ctrl.Result{}, fmt.Errorf("unexpected unpack status: %v", unpackResult.Message)
+	}
+
+	return ctrl.Result{}, nil // Successfully unpacked
+}
+
+// runPreflightChecks performs preflight checks based on the installation state.
+func (r *ClusterExtensionReconciler) runPreflightChecks(ctx context.Context, ext *ocv1alpha1.ClusterExtension, state releaseState, desiredRel *release.Release) error {
+	for _, preflight := range r.Preflights {
+		// Skip CRD Upgrade Safety preflight check if disabled
+		if ext.Spec.Preflight != nil && ext.Spec.Preflight.CRDUpgradeSafety != nil {
+			if _, ok := preflight.(*crdupgradesafety.Preflight); ok && ext.Spec.Preflight.CRDUpgradeSafety.Disabled {
+				continue
+			}
+		}
+
+		switch state {
+		case stateNeedsInstall:
+			if err := preflight.Install(ctx, desiredRel); err != nil {
+				setInstalledStatusConditionFailed(ext, fmt.Sprintf("%s:%v", ocv1alpha1.ReasonInstallationFailed, err))
+				return err
+			}
+		case stateNeedsUpgrade:
+			if err := preflight.Upgrade(ctx, desiredRel); err != nil {
+				setInstalledStatusConditionFailed(ext, fmt.Sprintf("%s:%v", ocv1alpha1.ReasonUpgradeFailed, err))
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+// installOrUpgrade installs or upgrades the Helm release based on the release state.
+func (r *ClusterExtensionReconciler) installOrUpgrade(state releaseState, ac helmclient.ActionInterface, ext *ocv1alpha1.ClusterExtension, chrt *chart.Chart, values chartutil.Values, post *postrenderer, rel *release.Release) (*release.Release, error) {
+	switch state {
+	case stateNeedsInstall:
+		rel, err := ac.Install(ext.GetName(), ext.Spec.InstallNamespace, chrt, values, func(install *action.Install) error {
+			install.CreateNamespace = false
+			install.Labels = post.labels
+			return nil
+		}, helmclient.AppendInstallPostRenderer(post))
+		if err != nil {
+			return nil, fmt.Errorf("%s: %w", ocv1alpha1.ReasonInstallationFailed, err)
+		}
+		return rel, nil
+
+	case stateNeedsUpgrade:
+		rel, err := ac.Upgrade(ext.GetName(), ext.Spec.InstallNamespace, chrt, values, helmclient.AppendUpgradePostRenderer(post))
+		if err != nil {
+			return nil, fmt.Errorf("%s: %w", ocv1alpha1.ReasonUpgradeFailed, err)
+		}
+		return rel, nil
+
+	case stateUnchanged:
+		return rel, nil // No changes needed
+
+	default:
+		return nil, fmt.Errorf("unexpected release state %q", state)
+	}
+}
+
 // SetDeprecationStatus will set the appropriate deprecation statuses for a ClusterExtension
 // based on the provided bundle
 func SetDeprecationStatus(ext *ocv1alpha1.ClusterExtension, bundle *catalogmetadata.Bundle) {
@@ -795,3 +826,33 @@ func (r *ClusterExtensionReconciler) validateBundle(bundle *catalogmetadata.Bund
 
 	return nil
 }
+
+// watchDynamicResources watches dynamically created resources from the Helm release.
+func (r *ClusterExtensionReconciler) watchDynamicResources(ctx context.Context, ext *ocv1alpha1.ClusterExtension, rel *release.Release) error {
+	relObjects, err := util.ManifestObjects(strings.NewReader(rel.Manifest), fmt.Sprintf("%s-release-manifest", rel.Name))
+	if err != nil {
+		return fmt.Errorf("failed to parse manifest objects: %w", err)
+	}
+
+	for _, obj := range relObjects {
+		if err := func() error {
+			r.dynamicWatchMutex.Lock()
+			defer r.dynamicWatchMutex.Unlock()
+
+			gvk := obj.GetObjectKind().GroupVersionKind()
+			_, isWatched := r.dynamicWatchGVKs[gvk]
+			if !isWatched {
+				if err := r.controller.Watch(
+					source.Kind(r.cache, obj, crhandler.EnqueueRequestForOwner(r.Scheme(), r.RESTMapper(), ext, crhandler.OnlyControllerOwner())),
+				); err != nil {
+					return err
+				}
+				r.dynamicWatchGVKs[gvk] = sets.Empty{}
+			}
+			return nil
+		}(); err != nil {
+			return err // Return error from the inner function
+		}
+	}
+	return nil
+}
diff --git a/internal/controllers/common_controller.go b/internal/controllers/common_controller.go
index 61cf0a950..c372c9968 100644
--- a/internal/controllers/common_controller.go
+++ b/internal/controllers/common_controller.go
@@ -54,6 +54,22 @@ func setResolvedStatusConditionFailed(ext *ocv1alpha1.ClusterExtension, message
 	})
 }
 
+// setInstalledStatusConditionProgressing sets the installed status condition to progressing.
+func setInstalledStatusConditionProgressing(ext *ocv1alpha1.ClusterExtension, message string) {
+	apimeta.SetStatusCondition(&ext.Status.Conditions, metav1.Condition{
+		Type:               ocv1alpha1.TypeProgressing, // Use the new condition type
+		Status:             metav1.ConditionTrue,       // Set to True to indicate in progress
+		Reason:             ocv1alpha1.ReasonInstallationInProgress,
+		Message:            message,
+		ObservedGeneration: ext.GetGeneration(),
+	})
+}
+
+// clearInstalledStatusConditionProgressing clears the progressing condition.
+func clearInstalledStatusConditionProgressing(ext *ocv1alpha1.ClusterExtension) {
+	apimeta.RemoveStatusCondition(&ext.Status.Conditions, ocv1alpha1.TypeProgressing)
+}
+
 // setInstalledStatusConditionSuccess sets the installed status condition to success.
 func setInstalledStatusConditionSuccess(ext *ocv1alpha1.ClusterExtension, message string) {
 	apimeta.SetStatusCondition(&ext.Status.Conditions, metav1.Condition{

From 0469c53620925e8faf21a912dd499174cb7c319e Mon Sep 17 00:00:00 2001
From: Brett Tofel <btofel@redhat.com>
Date: Wed, 10 Jul 2024 11:07:10 -0400
Subject: [PATCH 13/13] Fixup spurious comment punctuation

Signed-off-by: Brett Tofel <btofel@redhat.com>
---
 api/v1alpha1/clusterextension_types.go                          | 2 +-
 .../crd/bases/olm.operatorframework.io_clusterextensions.yaml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/v1alpha1/clusterextension_types.go b/api/v1alpha1/clusterextension_types.go
index 85fe90d55..18aa149b9 100644
--- a/api/v1alpha1/clusterextension_types.go
+++ b/api/v1alpha1/clusterextension_types.go
@@ -176,7 +176,7 @@ type BundleMetadata struct {
 	Version string `json:"version"`
 }
 
-// ClusterExtensionStatus defines the observed state of ClusterExtension.
+// ClusterExtensionStatus defines the observed state of ClusterExtension
 type ClusterExtensionStatus struct {
 	// InstalledBundle should only be modified when a new bundle is successfully installed. This ensures that if there
 	//  is a previously successfully installed a bundle, and an upgrade fails, it is still communicated that there is
diff --git a/config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml b/config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml
index 24cdf64af..dcabf1470 100644
--- a/config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml
+++ b/config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml
@@ -113,7 +113,7 @@ spec:
             - serviceAccount
             type: object
           status:
-            description: ClusterExtensionStatus defines the observed state of ClusterExtension.
+            description: ClusterExtensionStatus defines the observed state of ClusterExtension
             properties:
               conditions:
                 items: