Fix linter

Signed-off-by: Varsha Prasad Narsing <[email protected]>

Author: varshaprasad96

api/v1alpha1/clusterextension_types.go

@@ -145,6 +145,8 @@ type ClusterExtensionStatus struct {
 	InstalledBundle *BundleMetadata `json:"installedBundle,omitempty"`
 	// +optional
 	ResolvedBundle *BundleMetadata `json:"resolvedBundle,omitempty"`
+	// +optional
+	ContentURL string `json:"contentURL,omitempty"`
 
 	// +patchMergeKey=type
 	// +patchStrategy=merge

config/crd/bases/olm.operatorframework.io_clusterextensions.yaml

@@ -151,6 +151,8 @@ spec:
                 x-kubernetes-list-map-keys:
                 - type
                 x-kubernetes-list-type: map
+              contentURL:
+                type: string
               installedBundle:
                 properties:
                   name:

internal/controllers/clusterextension_controller.go

@@ -604,7 +604,6 @@ func (r *ClusterExtensionReconciler) resolve(ctx context.Context, clusterExtensi
 				return nil, err
 			}
 			predicates = append(predicates, catalogfilter.InMastermindsSemverRange(wantedVersionRangeConstraint))
-
 		}
 	}
 

internal/controllers/clusterextension_status.go

@@ -62,10 +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,
-	}
+	status.ContentURL = contentURL
 	meta.SetStatusCondition(&status.Conditions, metav1.Condition{
 		Type:    rukpakapi.TypeUnpacked,
 		Status:  metav1.ConditionTrue,

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{