Merge container build and kind-load make targets

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

Author: OchiengEd

Makefile

@@ -24,6 +24,11 @@ IMAGE_TAG := devel
 endif
 export 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 $@)
+
 IMG := $(IMAGE_REPO):$(IMAGE_TAG)
 CATALOGD_IMG := $(CATALOG_IMAGE_REPO):$(IMAGE_TAG)
 
@@ -264,7 +269,7 @@ e2e-coverage:
 .PHONY: kind-load
 kind-load: $(KIND) #EXHELP Loads the currently constructed images into the KIND cluster.
 	$(CONTAINER_RUNTIME) save $(IMG) | $(KIND) load image-archive /dev/stdin --name $(KIND_CLUSTER_NAME)
-	IMAGE_REPO=$(CATALOG_IMAGE_REPO) KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME) $(MAKE) -f Makefile.catalogd kind-load
+	$(CONTAINER_RUNTIME) save $(CATALOGD_IMG) | $(KIND) load image-archive /dev/stdin --name $(KIND_CLUSTER_NAME)
 
 .PHONY: kind-deploy
 kind-deploy: export MANIFEST := ./operator-controller.yaml
@@ -325,16 +330,17 @@ go-build-linux: export GOARCH=amd64
 go-build-linux: $(BINARIES) go-build-catalogd-linux
 
 .PHONY: run
-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.
+run: docker-build kind-cluster 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 build-catalogd-container  #EXHELP Build docker image for operator-controller and catalog with GOOS=linux and local GOARCH.
+docker-build: build-linux #EXHELP Build docker image for operator-controller and catalog with GOOS=linux and local GOARCH.
 	$(CONTAINER_RUNTIME) build -t $(IMG) -f Dockerfile ./bin/linux
+	$(CONTAINER_RUNTIME) build -f Dockerfile.catalogd -t $(CATALOGD_IMG) ./bin/linux
 
 #SECTION Release
 ifeq ($(origin ENABLE_RELEASE_PIPELINE), undefined)
@@ -349,7 +355,7 @@ export GORELEASER_ARGS
 
 .PHONY: release
 release: $(GORELEASER) #EXHELP Runs goreleaser for the operator-controller. By default, this will run only as a snapshot and will not publish any artifacts unless it is run with different arguments. To override the arguments, run with "GORELEASER_ARGS=...". When run as a github action from a tag, this target will publish a full release.
-	OPERATOR_CONTROLLER_IMAGE_REPO=$(IMAGE_REPO) CATALOGD_IMAGE_REPO=$(CATALOG_IMAGE_REPO) $(GORELEASER) $(GORELEASER_ARGS)
+	OPERATOR_CONTROLLER_IMAGE_REPO=$(IMAGE_REPO) CATALOG_IMAGE_REPO=$(CATALOG_IMAGE_REPO) $(GORELEASER) $(GORELEASER_ARGS)
 
 .PHONY: quickstart
 quickstart: export MANIFEST := https://github.com/operator-framework/operator-controller/releases/download/$(VERSION)/operator-controller.yaml
@@ -392,23 +398,6 @@ 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)
@@ -423,12 +412,4 @@ $(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