diff --git a/api/v1alpha1/clusterextension_types.go b/api/v1alpha1/clusterextension_types.go index e46399f1d..d070c3f73 100644 --- a/api/v1alpha1/clusterextension_types.go +++ b/api/v1alpha1/clusterextension_types.go @@ -145,7 +145,6 @@ type ClusterExtensionStatus struct { InstalledBundle *BundleMetadata `json:"installedBundle,omitempty"` // +optional ResolvedBundle *BundleMetadata `json:"resolvedBundle,omitempty"` - // +patchMergeKey=type // +patchStrategy=merge // +listType=map diff --git a/internal/controllers/clusterextension_controller.go b/internal/controllers/clusterextension_controller.go index 028a1cec7..3c180e2d1 100644 --- a/internal/controllers/clusterextension_controller.go +++ b/internal/controllers/clusterextension_controller.go @@ -201,11 +201,7 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp if err := r.Storage.Store(ctx, ext, unpackResult.Bundle); err != nil { return ctrl.Result{}, updateStatusUnpackFailing(&ext.Status, err) } - contentURL, err := r.Storage.URLFor(ctx, ext) - if err != nil { - return ctrl.Result{}, updateStatusUnpackFailing(&ext.Status, err) - } - updateStatusUnpacked(&ext.Status, unpackResult, contentURL) + updateStatusUnpacked(&ext.Status, unpackResult) default: return ctrl.Result{}, updateStatusUnpackFailing(&ext.Status, err) } diff --git a/internal/controllers/clusterextension_status.go b/internal/controllers/clusterextension_status.go index 67992cc98..ba5de76cd 100644 --- a/internal/controllers/clusterextension_status.go +++ b/internal/controllers/clusterextension_status.go @@ -62,11 +62,7 @@ func updateStatusUnpacking(status *ocv1alpha1.ClusterExtensionStatus, result *so }) } -func updateStatusUnpacked(status *ocv1alpha1.ClusterExtensionStatus, result *source.Result, contentURL string) { - // TODO: Expose content URL through CE status. - status.ResolvedBundle = &ocv1alpha1.BundleMetadata{ - Name: result.ResolvedSource.Image.Ref, - } +func updateStatusUnpacked(status *ocv1alpha1.ClusterExtensionStatus, result *source.Result) { meta.SetStatusCondition(&status.Conditions, metav1.Condition{ Type: rukpakv1alpha2.TypeUnpacked, Status: metav1.ConditionTrue, diff --git a/internal/controllers/common_controller.go b/internal/controllers/common_controller.go index 9f440b188..40c65cc8c 100644 --- a/internal/controllers/common_controller.go +++ b/internal/controllers/common_controller.go @@ -43,17 +43,6 @@ 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, - }) -} - // setResolvedStatusConditionFailed sets the resolved status condition to failed. func setResolvedStatusConditionFailed(conditions *[]metav1.Condition, message string, generation int64) { apimeta.SetStatusCondition(conditions, metav1.Condition{