Bug 1866168: [deprecation] Remove OperatorSource API

This PR removes the OperatorSource API from the cluster

Author: anik120

Gopkg.lock

@@ -78,14 +78,6 @@ required = [
   name = "github.com/operator-framework/operator-lifecycle-manager"
   version = "v0.14.1"
 
-[[constraint]]
-  branch = "master"
-  name = "github.com/operator-framework/go-appr"
-
-[[constraint]]
-  name = "github.com/golang/mock"
-  version = "v1.2.0"
-
 [[constraint]]
   branch = "release-4.2"
   name = "github.com/openshift/api"

Gopkg.toml

@@ -21,34 +21,11 @@ osbs-build:
 	# hack/build.sh
 	./build/build.sh
 
-unit: generate-mocks unit-test
+unit: unit-test
 
 unit-test:
 	go test -v ./pkg/...
 
-generate-mocks:
-	# Build mockgen from the same version used by gomock. This ensures that 
-	# gomock and mockgen are never out of sync.
-	go install ./vendor/github.com/golang/mock/mockgen
-	
-	@echo making sure directory for mocks exists
-	mkdir -p $(MOCKS_DIR)
-
-	# $(mockgen) -destination=<Path/file where the mock is generated> -package=<The package that the generated mock files will belong to> -mock_names=<Original Interface name>=<Name of Generated mocked Interface> <Go package path of the original interface> <comma seperated list of the interface you want to mock>
-	$(mockgen) -destination=$(MOCKS_DIR)/$(OPERATORSOURCE_MOCK_PKG)/mock_datastore.go -package=$(OPERATORSOURCE_MOCK_PKG) -mock_names=Reader=DatastoreReader,Writer=DatastoreWriter $(PKG)/datastore Reader,Writer
-	$(mockgen) -destination=$(MOCKS_DIR)/$(OPERATORSOURCE_MOCK_PKG)/mock_phase_reconciler.go -package=$(OPERATORSOURCE_MOCK_PKG) -mock_names=Reconciler=PhaseReconciler $(PKG)/operatorsource Reconciler
-	$(mockgen) -destination=$(MOCKS_DIR)/$(OPERATORSOURCE_MOCK_PKG)/mock_phase_tansitioner.go -package=$(OPERATORSOURCE_MOCK_PKG) -mock_names=Transitioner=PhaseTransitioner $(PKG)/phase Transitioner
-	$(mockgen) -destination=$(MOCKS_DIR)/$(OPERATORSOURCE_MOCK_PKG)/mock_client.go -package=$(OPERATORSOURCE_MOCK_PKG) -mock_names=Client=Client $(PKG)/client Client
-	$(mockgen) -destination=$(MOCKS_DIR)/$(OPERATORSOURCE_MOCK_PKG)/mock_phase_reconciler_strategy.go -package=$(OPERATORSOURCE_MOCK_PKG) $(PKG)/operatorsource PhaseReconcilerFactory
-	$(mockgen) -destination=$(MOCKS_DIR)/$(OPERATORSOURCE_MOCK_PKG)/mock_appregistry.go -package=$(OPERATORSOURCE_MOCK_PKG) -mock_names=ClientFactory=AppRegistryClientFactory,Client=AppRegistryClient $(PKG)/appregistry ClientFactory,Client
-	$(mockgen) -destination=$(MOCKS_DIR)/$(OPERATORSOURCE_MOCK_PKG)/mock_syncer.go -package=$(OPERATORSOURCE_MOCK_PKG) -mock_names=PackageRefreshNotificationSender=SyncerPackageRefreshNotificationSender $(PKG)/operatorsource PackageRefreshNotificationSender
-
-clean-mocks:
-	@echo cleaning mock folder
-	rm -rf $(MOCKS_DIR)
-
-clean: clean-mocks
-
 e2e-test:
 	./scripts/e2e-tests.sh
 

Makefile

@@ -21,14 +21,14 @@ import (
 	"github.com/operator-framework/operator-marketplace/pkg/controller/options"
 	"github.com/operator-framework/operator-marketplace/pkg/defaults"
 	"github.com/operator-framework/operator-marketplace/pkg/operatorhub"
-	"github.com/operator-framework/operator-marketplace/pkg/registry"
 	"github.com/operator-framework/operator-marketplace/pkg/status"
 	sourceCommit "github.com/operator-framework/operator-marketplace/pkg/version"
 	"github.com/operator-framework/operator-sdk/pkg/k8sutil"
 	"github.com/operator-framework/operator-sdk/pkg/leader"
 	sdkVersion "github.com/operator-framework/operator-sdk/version"
 	log "github.com/sirupsen/logrus"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	k8sErrors "k8s.io/apimachinery/pkg/api/errors"
 	kruntime "k8s.io/apimachinery/pkg/runtime"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	"k8s.io/client-go/rest"
@@ -62,10 +62,8 @@ func main() {
 	printVersion()
 
 	// Parse the command line arguments
-	flag.StringVar(&registry.ServerImage, "registryServerImage",
-		registry.DefaultServerImage, "the image to use for creating the operator registry pod")
 	flag.StringVar(&defaults.Dir, "defaultsDir",
-		"", "the directory where the default OperatorSources are stored")
+		"", "the directory where the default CatalogSources are stored")
 	var clusterOperatorName string
 	flag.StringVar(&clusterOperatorName, "clusterOperatorName", "", "the name of the OpenShift ClusterOperator that should reflect this operator's status, or the empty string to disable ClusterOperator updates")
 	flag.Parse()
@@ -153,7 +151,7 @@ func main() {
 	}
 
 	// Setup all Controllers
-	if err := controller.AddToManager(mgr, options.ControllerOptions{SyncSender: statusReporter}); err != nil {
+	if err := controller.AddToManager(mgr, options.ControllerOptions{}); err != nil {
 		exit(err)
 	}
 
@@ -176,14 +174,14 @@ func main() {
 
 	// migrate away from Marketplace API
 	clientGo, err := client.New(cfg, client.Options{Scheme: mgr.GetScheme()})
-	if err != nil {
+	if err != nil && !k8sErrors.IsNotFound(err) {
 		log.Error(err, "Failed to instantiate client for migrator")
 		os.Exit(1)
 	}
 	migrator := migrator.New(clientGo)
 	err = migrator.Migrate()
 	if err != nil {
-		log.Error(err, "[migration] Error in migrating Marketplace away from CatalogSourceConfig API")
+		log.Error(err, "[migration] Error in migrating Marketplace away from OperatorSource API")
 	}
 
 	// Populate the global default OperatorSources definition and config