🌱 Move catalogd controllers and webhooks to internal/catalogd (#1749)

* Moving catalogd controllers and webhook

Moving  catalogd/internal/controllers and catalogd/internal/webhooks
to internal/catalogd along with the Makefile changes

Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>

* Removed 'build-deps' target from catalogd Makefile

As build-deps needs the generate target which has been moved to the root
Makefile i.e. operator-controller/Makefile

Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>

---------

Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>

Author: LalatenduMohanty

Makefile

@@ -115,16 +115,18 @@ tidy: #HELP Update dependencies.
 	# Force tidy to use the version already in go.mod
 	$(Q)go mod tidy -go=$(GOLANG_VERSION)
 
-
 .PHONY: manifests
 KUSTOMIZE_CRDS_DIR := config/base/crd/bases
 KUSTOMIZE_RBAC_DIR := config/base/rbac
+KUSTOMIZE_WEBHOOKS_DIR := config/base/manager/webhook
 manifests: $(CONTROLLER_GEN) #EXHELP Generate WebhookConfiguration, ClusterRole, and CustomResourceDefinition objects.
-	# To generate the manifests used and do not use catalogd directory
+	# Generate the operator-controller manifests
 	rm -rf $(KUSTOMIZE_CRDS_DIR) && $(CONTROLLER_GEN) crd paths=./api/... output:crd:artifacts:config=$(KUSTOMIZE_CRDS_DIR)
 	rm -f $(KUSTOMIZE_RBAC_DIR)/role.yaml && $(CONTROLLER_GEN) rbac:roleName=manager-role paths=./internal/operator-controller/... output:rbac:artifacts:config=$(KUSTOMIZE_RBAC_DIR)
-	# To generate the manifests for catalogd
-	$(MAKE) -C catalogd generate
+	# Generate the catalogd manifests
+	rm -rf catalogd/$(KUSTOMIZE_CRDS_DIR) && $(CONTROLLER_GEN) crd paths="./catalogd/api/..." output:crd:artifacts:config=catalogd/$(KUSTOMIZE_CRDS_DIR)
+	rm -f catalogd/$(KUSTOMIZE_RBAC_DIR)/role.yaml && $(CONTROLLER_GEN) rbac:roleName=manager-role paths="./internal/catalogd/..." output:rbac:artifacts:config=catalogd/$(KUSTOMIZE_RBAC_DIR)
+	rm -f catalogd/$(KUSTOMIZE_WEBHOOKS_DIR)/manifests.yaml && $(CONTROLLER_GEN) webhook paths="./internal/catalogd/..." output:webhook:artifacts:config=catalogd/$(KUSTOMIZE_WEBHOOKS_DIR)
 
 .PHONY: generate
 generate: $(CONTROLLER_GEN) #EXHELP Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.

catalogd/Makefile

@@ -58,16 +58,6 @@ help: ## Display this help.
 clean: ## Remove binaries and test artifacts
 	rm -rf bin
 
-.PHONY: generate
-KUSTOMIZE_CRDS_DIR := config/base/crd/bases
-KUSTOMIZE_RBAC_DIR := config/base/rbac
-KUSTOMIZE_WEBHOOKS_DIR := config/base/manager/webhook
-generate: $(CONTROLLER_GEN) ## Generate code and manifests.
-	$(CONTROLLER_GEN) object:headerFile="../hack/boilerplate.go.txt" paths="./..."
-	rm -rf $(KUSTOMIZE_CRDS_DIR) && $(CONTROLLER_GEN) crd paths="./api/..." output:crd:artifacts:config=$(KUSTOMIZE_CRDS_DIR)
-	rm -f $(KUSTOMIZE_RBAC_DIR)/role.yaml && $(CONTROLLER_GEN) rbac:roleName=manager-role paths="./internal/..." output:rbac:artifacts:config=$(KUSTOMIZE_RBAC_DIR)
-	rm -f $(KUSTOMIZE_WEBHOOKS_DIR)/manifests.yaml && $(CONTROLLER_GEN) webhook paths="./internal/..." output:webhook:artifacts:config=$(KUSTOMIZE_WEBHOOKS_DIR)
-
 ##@ Build
 
 BINARIES=catalogd
@@ -98,18 +88,15 @@ export GO_BUILD_TAGS     := containers_image_openpgp
 
 BUILDCMD = go build -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o $(BUILDBIN)/$(notdir $@) ./cmd/$(notdir $@)
 
-.PHONY: build-deps
-build-deps: generate
-
 .PHONY: build go-build-local $(BINARIES)
-build: build-deps go-build-local ## Build binaries for current GOOS and GOARCH.
+build: go-build-local ## Build binaries for current GOOS and GOARCH.
 go-build-local: $(BINARIES)
 $(BINARIES): BUILDBIN = bin
 $(BINARIES):
 	$(BUILDCMD)
 
 .PHONY: build-linux go-build-linux $(LINUX_BINARIES)
-build-linux: build-deps go-build-linux ## Build binaries for GOOS=linux and local GOARCH.
+build-linux: go-build-linux ## Build binaries for GOOS=linux and local GOARCH.
 go-build-linux: $(LINUX_BINARIES)
 $(LINUX_BINARIES): BUILDBIN = bin/linux
 $(LINUX_BINARIES):

catalogd/cmd/catalogd/main.go

@@ -56,14 +56,14 @@ import (
 	crwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"
 
 	catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
-	corecontrollers "github.com/operator-framework/operator-controller/catalogd/internal/controllers/core"
-	"github.com/operator-framework/operator-controller/catalogd/internal/webhook"
+	corecontrollers "github.com/operator-framework/operator-controller/internal/catalogd/controllers/core"
 	"github.com/operator-framework/operator-controller/internal/catalogd/features"
 	"github.com/operator-framework/operator-controller/internal/catalogd/garbagecollection"
 	catalogdmetrics "github.com/operator-framework/operator-controller/internal/catalogd/metrics"
 	"github.com/operator-framework/operator-controller/internal/catalogd/serverutil"
 	"github.com/operator-framework/operator-controller/internal/catalogd/source"
 	"github.com/operator-framework/operator-controller/internal/catalogd/storage"
+	"github.com/operator-framework/operator-controller/internal/catalogd/webhook"
 	fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs"
 	"github.com/operator-framework/operator-controller/internal/shared/version"
 )