Bug 1831818: Remove Obsolete default OperatorSource

cmd/manager/main.go

@@ -198,6 +198,10 @@ func main() {
 		exit(err)
 	}
 
+	err = defaults.RemoveObsoleteOpsrc(clientGo)
+	if err != nil {
+		log.Error(err, "[defaults] Could not remove obsolete default OperatorSource/s")
+	}
 	// statusReportingDoneCh will be closed after the operator has successfully stopped reporting ClusterOperator status.
 	statusReportingDoneCh := statusReporter.StartReporting()
 

pkg/defaults/defaults.go

@@ -1,12 +1,15 @@
 package defaults
 
 import (
+	"context"
 	"io/ioutil"
 	"os"
 
 	olm "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
 	"github.com/operator-framework/operator-marketplace/pkg/apis/operators/v1"
 	wrapper "github.com/operator-framework/operator-marketplace/pkg/client"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 var (
@@ -179,3 +182,23 @@ func populateDefsConfig(dir string) (map[string]v1.OperatorSource, map[string]ol
 	}
 	return opsrcDefinitions, catsrcDefinitions, config, nil
 }
+
+// RemoveObsoleteOpsrc removes any existing default OperatorSource
+// in the cluster that has been switched into a default CatalogSource
+func RemoveObsoleteOpsrc(kubeClient client.Client) error {
+	opsrcs := &v1.OperatorSourceList{}
+	if err := kubeClient.List(context.TODO(), &client.ListOptions{}, opsrcs); err != nil {
+		return err
+	}
+	allErrors := []error{}
+	for _, opsrc := range opsrcs.Items {
+		_, presentInOpsrcDefs := globalOpsrcDefinitions[opsrc.Name]
+		_, presentInCatsrcDefs := globalCatsrcDefinitions[opsrc.Name]
+		if !presentInOpsrcDefs && presentInCatsrcDefs {
+			if err := kubeClient.Delete(context.TODO(), &opsrc); err != nil {
+				allErrors = append(allErrors, err)
+			}
+		}
+	}
+	return utilerrors.NewAggregate(allErrors)
+}