Address Tim's comments

Author: awgreene

pkg/controller/operators/olm/operator.go

@@ -1422,18 +1422,17 @@ func (a *Operator) syncCopyCSV(obj interface{}) (syncError error) {
 // without an error.
 func (a *Operator) copiedCSVsAreEnabled() (bool, error) {
 	olmConfig, err := a.client.OperatorsV1().OLMConfigs().Get(context.TODO(), "cluster", metav1.GetOptions{})
-	// If there was an error that wasn't an IsNotFound, return the error
-	if err != nil && !k8serrors.IsNotFound(err) {
+	if err != nil {
+		// Default to true if olmConfig singleton cannot be found
+		if k8serrors.IsNotFound(err) {
+			return true, nil
+		}
+		// If there was an error that wasn't an IsNotFound, return the error
 		return false, err
 	}
 
-	// If there was no error, return value based on olmConfig ingleton
-	if err == nil {
-		return olmConfig.CopiedCSVsAreEnabled(), nil
-	}
-
-	// Default to true if olmConfig cannot be found
-	return true, nil
+	// If there was no error, return value based on olmConfig singleton
+	return olmConfig.CopiedCSVsAreEnabled(), nil
 }
 
 func (a *Operator) getCopiedCSVDisabledEventsForCSV(csv *v1alpha1.ClusterServiceVersion) ([]corev1.Event, error) {