Merge pull request #945 from jpeeler/minor-fixes

Minor fixes

Author: openshift-merge-robot

pkg/api/wrappers/deployment_install_client.go

@@ -123,8 +123,7 @@ func (c *InstallStrategyDeploymentClientForNamespace) FindAnyDeploymentsMatching
 
 func (c *InstallStrategyDeploymentClientForNamespace) FindAnyDeploymentsMatchingLabels(label labels.Selector) ([]*appsv1.Deployment, error) {
 	deployments, err := c.opLister.AppsV1().DeploymentLister().Deployments(c.Namespace).List(label)
-	// Any errors other than !exists are propagated up
-	if err != nil && !apierrors.IsNotFound(err) {
+	if err != nil {
 		return nil, err
 	}
 

test/e2e/setup_bare_test.go

@@ -13,8 +13,10 @@ import (
 	"time"
 
 	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	utilclock "k8s.io/apimachinery/pkg/util/clock"
+	"k8s.io/client-go/tools/clientcmd"
 
 	v1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/api/client"
@@ -73,6 +75,11 @@ func TestMain(m *testing.M) {
 	ctx, cancel := context.WithCancel(signals.Context())
 	defer cancel()
 
+	config, err := clientcmd.BuildConfigFromFlags("", *kubeConfigPath)
+	if err != nil {
+		log.Fatalf("error configuring client: %s", err.Error())
+	}
+
 	// operator dependencies
 	crClient, err := client.NewClient(*kubeConfigPath)
 	if err != nil {
@@ -116,6 +123,7 @@ func TestMain(m *testing.M) {
 		olm.WithResyncPeriod(time.Minute),
 		olm.WithExternalClient(crClient),
 		olm.WithOperatorClient(olmOpClient),
+		olm.WithRestConfig(config),
 	)
 	if err != nil {
 		logrus.WithError(err).Fatalf("error configuring olm")