No more panics (#767)

Signed-off-by: Todd Short <[email protected]>

Author: tmshort

api/v1alpha1/clusterextension_types.go

@@ -134,6 +134,8 @@ func init() {
 		ReasonErrorGettingReleaseState,
 		ReasonUpgradeFailed,
 		ReasonCreateDynamicWatchFailed,
+		ReasonBundleLoadFailed,
+		ReasonErrorGettingClient,
 	)
 }
 

cmd/manager/main.go

@@ -116,6 +116,7 @@ func main() {
 	acg, err := helmclient.NewActionClientGetter(cfgGetter)
 	if err != nil {
 		setupLog.Error(err, "unable to create helm client")
+		os.Exit(1)
 	}
 
 	if systemNamespace == "" {
@@ -125,6 +126,7 @@ func main() {
 	unpacker, err := source.NewDefaultUnpacker(mgr, systemNamespace, unpackImage)
 	if err != nil {
 		setupLog.Error(err, "unable to create unpacker")
+		os.Exit(1)
 	}
 
 	storageURL, err := url.Parse(fmt.Sprintf("%s/bundles/", httpExternalAddr))

internal/controllers/clusterextension_controller.go

@@ -111,6 +111,9 @@ func (r *ClusterExtensionReconciler) Reconcile(ctx context.Context, req ctrl.Req
 
 	reconciledExt := existingExt.DeepCopy()
 	res, reconcileErr := r.reconcile(ctx, reconciledExt)
+	if reconcileErr != nil {
+		return ctrl.Result{}, reconcileErr
+	}
 
 	// Do checks before any Update()s, as Update() may modify the resource structure!
 	updateStatus := !equality.Semantic.DeepEqual(existingExt.Status, reconciledExt.Status)

internal/controllers/suite_test.go

@@ -22,15 +22,21 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/go-logr/logr"
 	"github.com/stretchr/testify/require"
+	"k8s.io/apimachinery/pkg/api/meta"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/manager"
 
 	"github.com/operator-framework/deppy/pkg/deppy/solver"
+	helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
 
 	"github.com/operator-framework/operator-controller/internal/controllers"
+	"github.com/operator-framework/operator-controller/internal/rukpak/source"
+	"github.com/operator-framework/operator-controller/internal/rukpak/util"
 	"github.com/operator-framework/operator-controller/pkg/scheme"
 	testutil "github.com/operator-framework/operator-controller/test/util"
 )
@@ -49,9 +55,11 @@ func newClientAndReconciler(t *testing.T) (client.Client, *controllers.ClusterEx
 	cl := newClient(t)
 	fakeCatalogClient := testutil.NewFakeCatalogClient(testBundleList)
 	reconciler := &controllers.ClusterExtensionReconciler{
-		Client:         cl,
-		BundleProvider: &fakeCatalogClient,
-		Scheme:         scheme.Scheme,
+		Client:             cl,
+		BundleProvider:     &fakeCatalogClient,
+		Scheme:             scheme.Scheme,
+		ActionClientGetter: acg,
+		Unpacker:           unp,
 	}
 	return cl, reconciler
 }
@@ -68,6 +76,8 @@ func newClientAndExtensionReconciler(t *testing.T) (client.Client, *controllers.
 
 var (
 	cfg *rest.Config
+	acg helmclient.ActionClientGetter
+	unp source.Unpacker
 )
 
 func TestMain(m *testing.M) {
@@ -85,6 +95,17 @@ func TestMain(m *testing.M) {
 		log.Panic("expected cfg to not be nil")
 	}
 
+	rm := meta.NewDefaultRESTMapper(nil)
+	cfgGetter, err := helmclient.NewActionConfigGetter(cfg, rm, logr.Logger{})
+	utilruntime.Must(err)
+	acg, err = helmclient.NewActionClientGetter(cfgGetter)
+	utilruntime.Must(err)
+
+	mgr, err := manager.New(cfg, manager.Options{})
+	utilruntime.Must(err)
+	unp, err = source.NewDefaultUnpacker(mgr, util.DefaultSystemNamespace, util.DefaultUnpackImage)
+	utilruntime.Must(err)
+
 	code := m.Run()
 	utilruntime.Must(testEnv.Stop())
 	os.Exit(code)