Fix linter, remove debug logs and extraneous file

Signed-off-by: dtfranz <[email protected]>

Author: dtfranz

internal/.DS_Store

@@ -454,14 +454,11 @@ func (r *ClusterExtensionReconciler) resolve(ctx context.Context, ext ocv1alpha1
 		if err != nil {
 			return nil, err
 		}
-		fmt.Println("upgrade error!!!!")
 		upgradeErrorPrefix = fmt.Sprintf("error upgrading from currently installed version %q: ", installedBundleVersion.String())
 	}
 	if len(resultSet) == 0 {
-		fmt.Println("empty resilt set!!")
 		switch {
 		case versionRange != "" && channelName != "":
-			fmt.Println("here!!!")
 			return nil, fmt.Errorf("%sno package %q matching version %q in channel %q found", upgradeErrorPrefix, packageName, versionRange, channelName)
 		case versionRange != "":
 			return nil, fmt.Errorf("%sno package %q matching version %q found", upgradeErrorPrefix, packageName, versionRange)

internal/controllers/clusterextension_controller.go

@@ -19,14 +19,14 @@ package controllers
 import (
 	"context"
 
-	"k8s.io/apimachinery/pkg/api/meta"
 	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"
-	"github.com/operator-framework/operator-controller/internal/catalogmetadata"
 	rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2"
 	"github.com/operator-framework/rukpak/pkg/source"
+
+	ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"
+	"github.com/operator-framework/operator-controller/internal/catalogmetadata"
 )
 
 // BundleProvider provides the way to retrieve a list of Bundles from a source,
@@ -123,7 +123,7 @@ func setDeprecationStatusesUnknown(conditions *[]metav1.Condition, message strin
 
 func updateStatusUnpackFailing(status *ocv1alpha1.ClusterExtensionStatus, err error) error {
 	status.InstalledBundle = nil
-	meta.SetStatusCondition(&status.Conditions, metav1.Condition{
+	apimeta.SetStatusCondition(&status.Conditions, metav1.Condition{
 		Type:    rukpakv1alpha2.TypeUnpacked,
 		Status:  metav1.ConditionFalse,
 		Reason:  rukpakv1alpha2.ReasonUnpackFailed,
@@ -135,7 +135,7 @@ 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, generation int64) {
 	status.InstalledBundle = nil
-	meta.SetStatusCondition(&status.Conditions, metav1.Condition{
+	apimeta.SetStatusCondition(&status.Conditions, metav1.Condition{
 		Type:               rukpakv1alpha2.TypeUnpacked,
 		Status:             metav1.ConditionFalse,
 		Reason:             rukpakv1alpha2.ReasonUnpackPending,
@@ -147,7 +147,7 @@ func updateStatusUnpackPending(status *ocv1alpha1.ClusterExtensionStatus, result
 // TODO: verify if we need to update the installBundle status or leave it as is.
 func updateStatusUnpacking(status *ocv1alpha1.ClusterExtensionStatus, result *source.Result) {
 	status.InstalledBundle = nil
-	meta.SetStatusCondition(&status.Conditions, metav1.Condition{
+	apimeta.SetStatusCondition(&status.Conditions, metav1.Condition{
 		Type:    rukpakv1alpha2.TypeUnpacked,
 		Status:  metav1.ConditionFalse,
 		Reason:  rukpakv1alpha2.ReasonUnpacking,
@@ -156,7 +156,7 @@ func updateStatusUnpacking(status *ocv1alpha1.ClusterExtensionStatus, result *so
 }
 
 func updateStatusUnpacked(status *ocv1alpha1.ClusterExtensionStatus, result *source.Result) {
-	meta.SetStatusCondition(&status.Conditions, metav1.Condition{
+	apimeta.SetStatusCondition(&status.Conditions, metav1.Condition{
 		Type:    rukpakv1alpha2.TypeUnpacked,
 		Status:  metav1.ConditionTrue,
 		Reason:  rukpakv1alpha2.ReasonUnpackSuccessful,