Merge the catalogd and operator-controller make files

Signed-off-by: Edmund Ochieng <[email protected]>

Author: OchiengEd

Makefile

@@ -315,27 +315,26 @@ build-deps: manifests generate fmt
 .PHONY: build go-build-local
 build: build-deps go-build-local #HELP Build manager binary for current GOOS and GOARCH. Default target.
 go-build-local: BUILDBIN := bin
-go-build-local: $(BINARIES)
+go-build-local: $(BINARIES) go-build-catalogd-local
 
 .PHONY: build-linux go-build-linux
 build-linux: build-deps go-build-linux #EXHELP Build manager binary for GOOS=linux and local GOARCH.
 go-build-linux: BUILDBIN := bin/linux
 go-build-linux: export GOOS=linux
 go-build-linux: export GOARCH=amd64
-go-build-linux: $(BINARIES)
+go-build-linux: $(BINARIES) go-build-catalogd-linux
 
 .PHONY: run
-run: docker-build kind-cluster kind-load kind-deploy wait #HELP Build the operator-controller then deploy it into a new kind cluster.
+run: docker-build kind-cluster kind-load-catalogd kind-load kind-deploy wait #HELP Build the operator-controller then deploy it into a new kind cluster.
 
 CATALOGD_NAMESPACE := olmv1-system
 wait:
 	kubectl wait --for=condition=Available --namespace=$(CATALOGD_NAMESPACE) deployment/catalogd-controller-manager --timeout=60s
 	kubectl wait --for=condition=Ready --namespace=$(CATALOGD_NAMESPACE) certificate/catalogd-service-cert # Avoid upgrade test flakes when reissuing cert
 
 .PHONY: docker-build
-docker-build: build-linux  #EXHELP Build docker image for operator-controller and catalog with GOOS=linux and local GOARCH.
+docker-build: build-linux build-catalogd-container  #EXHELP Build docker image for operator-controller and catalog with GOOS=linux and local GOARCH.
 	$(CONTAINER_RUNTIME) build -t $(IMG) -f Dockerfile ./bin/linux
-	IMAGE_REPO=$(CATALOG_IMAGE_REPO) $(MAKE) -f Makefile.catalogd build-container
 
 #SECTION Release
 ifeq ($(origin ENABLE_RELEASE_PIPELINE), undefined)
@@ -392,4 +391,44 @@ deploy-docs: venv
 demo-update:
 	./hack/demo/generate-asciidemo.sh -u -n catalogd-demo catalogd-demo-script.sh
 
+# Catalogd targets
+ifeq ($(origin CATALOGD_IMAGE_REPO), undefined)
+CATALOGD_IMAGE_REPO := quay.io/operator-framework/catalogd
+endif
+export CATALOGD_IMAGE_REPO
+
+ifeq ($(origin CATALOGD_IMAGE_TAG), undefined)
+CATALOGD_IMAGE_TAG := devel
+endif
+export CATALOGD_IMAGE_TAG
+
+CATALOGD_IMAGE := $(CATALOGD_IMAGE_REPO):$(CATALOGD_IMAGE_TAG)
+
+CATALOGD_BINARIES=catalogd
+LINUX_BINARIES=$(join $(addprefix linux/,$(CATALOGD_BINARIES)), )
+
+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: catalogd-build go-build-catalogd-local $(CATALOGD_BINARIES)
+catalogd-build: go-build-catalogd-local ## Build binaries for current GOOS and GOARCH.
+go-build-catalogd-local: $(CATALOGD_BINARIES)
+$(CATALOGD_BINARIES): BUILDBIN = bin
+$(CATALOGD_BINARIES):
+	$(BUILDCMD)
+
+.PHONY: catalogd-build-linux go-build-catalogd-linux $(LINUX_BINARIES)
+catalogd-build-linux: go-build-catalogd-linux ## Build binaries for GOOS=linux and local GOARCH.
+go-build-catalogd-linux: $(LINUX_BINARIES)
+$(LINUX_BINARIES): BUILDBIN = bin/linux
+$(LINUX_BINARIES):
+	GOOS=linux $(BUILDCMD)
+
+.PHONY: build-catalogd-container
+build-catalogd-container: catalogd-build-linux ## Build docker image for catalogd.
+	$(CONTAINER_RUNTIME) build -f Dockerfile.catalogd -t $(CATALOGD_IMAGE) ./bin/linux
+
+.PHONY: kind-load-catalogd
+kind-load-catalogd: $(KIND) ## Load the built images onto the local cluster
+	$(CONTAINER_RUNTIME) save $(CATALOGD_IMAGE) | $(KIND) load image-archive /dev/stdin --name $(KIND_CLUSTER_NAME)
+
 include Makefile.venv