From 68679321a8ce0ab5a22d6eb4473bd246c85125f6 Mon Sep 17 00:00:00 2001 From: Brett Tofel Date: Tue, 2 Jul 2024 06:20:30 -0400 Subject: [PATCH 01/11] Replace ReasonCreateDynamicWatchFailed w/ ReasonInstallationFailed Signed-off-by: Brett Tofel --- 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 c9760f95..bbb63366 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 3e392174..196ca5c9 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 Date: Tue, 2 Jul 2024 06:23:14 -0400 Subject: [PATCH 02/11] Remove unused ReasonInstallationSucceeded Signed-off-by: Brett Tofel --- 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 bbb63366..72f767ee 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 135cf59e4d03077ac8ca2423af98fc2ae9993214 Mon Sep 17 00:00:00 2001 From: Brett Tofel Date: Tue, 2 Jul 2024 08:56:11 -0400 Subject: [PATCH 03/11] Drop usage of ConditionUnknown on Pending Install Signed-off-by: Brett Tofel --- 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 196ca5c9..ae982f78 100644 --- a/internal/controllers/clusterextension_controller.go +++ b/internal/controllers/clusterextension_controller.go @@ -274,7 +274,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 8b07f404..5b054f41 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 b6a1109d226d13d4db49f284933e5c4d2d860fce Mon Sep 17 00:00:00 2001 From: Brett Tofel Date: Tue, 2 Jul 2024 09:56:54 -0400 Subject: [PATCH 04/11] Remove ReasonUnpackPending/InstallationsStatusUnk Signed-off-by: Brett Tofel --- 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 72f767ee..7fc8bd9b 100644 --- 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 index ae982f78..0316307a 100644 --- 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 index 09608afb..4c30c260 100644 --- 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 index 5b054f41..f5a59170 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 e0ff96d2703aad413bc93a3bc4d91276527ea718 Mon Sep 17 00:00:00 2001 From: Brett Tofel Date: Wed, 3 Jul 2024 07:30:03 -0400 Subject: [PATCH 05/11] Update related TODO in ClusterExtension controller Signed-off-by: Brett Tofel --- 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 0316307a..8549343c 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 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 f5a59170..640d557f 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 5758f100aa6b75e68c2bf99f2b6b377f69919230 Mon Sep 17 00:00:00 2001 From: Brett Tofel Date: Wed, 3 Jul 2024 10:20:28 -0400 Subject: [PATCH 06/11] Rm InstalledStatus->nil on upack & add comment Signed-off-by: Brett Tofel --- 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 7fc8bd9b..afcd439f 100644 --- a/api/v1alpha1/clusterextension_types.go +++ b/api/v1alpha1/clusterextension_types.go @@ -160,6 +160,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 640d557f..dff4aceb 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 1a0cc129152c86bd14ab993af8205b7dcbe81352 Mon Sep 17 00:00:00 2001 From: Brett Tofel Date: Wed, 3 Jul 2024 10:50:14 -0400 Subject: [PATCH 07/11] Align CRD for added Go doc on InstalledBundle Signed-off-by: Brett Tofel --- 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 afcd439f..69315bb7 100644 --- a/api/v1alpha1/clusterextension_types.go +++ b/api/v1alpha1/clusterextension_types.go @@ -159,9 +159,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 6331068a..2d71e459 100644 --- a/config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml +++ b/config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml @@ -95,7 +95,9 @@ spec: - packageName 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 0009cc0dce3816dbcd2a062a1592209af396ee69 Mon Sep 17 00:00:00 2001 From: Brett Tofel Date: Mon, 8 Jul 2024 07:50:33 -0400 Subject: [PATCH 08/11] Move comment on InstalledBundle field Signed-off-by: Brett Tofel --- 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 69315bb7..08dbf189 100644 --- a/api/v1alpha1/clusterextension_types.go +++ b/api/v1alpha1/clusterextension_types.go @@ -160,8 +160,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 c899a79cef3e260fe28a947a7570a3cd2a538b5e Mon Sep 17 00:00:00 2001 From: Brett Tofel Date: Mon, 8 Jul 2024 08:07:49 -0400 Subject: [PATCH 09/11] Commit manifest changes for godoc change Signed-off-by: Brett Tofel --- .../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 2d71e459..833cc55f 100644 --- a/config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml +++ b/config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml @@ -95,9 +95,7 @@ spec: - packageName 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: @@ -172,6 +170,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 0306c9dbf02de418d85e4783c4b57f1b3bafc3ed Mon Sep 17 00:00:00 2001 From: Brett Tofel Date: Mon, 8 Jul 2024 14:30:25 -0400 Subject: [PATCH 10/11] Decouple bundle unpacking and installed statuses Signed-off-by: Brett Tofel --- 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 8549343c..d2cd8987 100644 --- a/internal/controllers/clusterextension_controller.go +++ b/internal/controllers/clusterextension_controller.go @@ -274,8 +274,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 dff4aceb..66b27186 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 e5952e4f7dafe734f7ba31f216e7ac5b5cf48459 Mon Sep 17 00:00:00 2001 From: Brett Tofel Date: Tue, 9 Jul 2024 04:52:49 -0400 Subject: [PATCH 11/11] Remove unneeded unpack stage helper method Signed-off-by: Brett Tofel --- 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 d2cd8987..637edcfa 100644 --- 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: - 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 66b27186..61cf0a95 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,