Use consistent environment variable names

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

Author: OchiengEd

Makefile

@@ -14,10 +14,10 @@ IMAGE_REPO := quay.io/operator-framework/operator-controller
 endif
 export IMAGE_REPO
 
-ifeq ($(origin CATALOG_IMAGE_REPO), undefined)
-CATALOG_IMAGE_REPO := quay.io/operator-framework/catalogd
+ifeq ($(origin CATALOGD_IMAGE_REPO), undefined)
+CATALOGD_IMAGE_REPO := quay.io/operator-framework/catalogd
 endif
-export CATALOG_IMAGE_REPO
+export CATALOGD_IMAGE_REPO
 
 ifeq ($(origin IMAGE_TAG), undefined)
 IMAGE_TAG := devel
@@ -30,7 +30,7 @@ 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)
+CATALOGD_IMG := $(CATALOGD_IMAGE_REPO):$(IMAGE_TAG)
 
 # Define dependency versions (use go.mod if we also use Go code from dependency)
 export CERT_MGR_VERSION := v1.15.3
@@ -356,7 +356,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) CATALOG_IMAGE_REPO=$(CATALOG_IMAGE_REPO) $(GORELEASER) $(GORELEASER_ARGS)
+	OPERATOR_CONTROLLER_IMAGE_REPO=$(IMAGE_REPO) CATALOGD_IMAGE_REPO=$(CATALOGD_IMAGE_REPO) $(GORELEASER) $(GORELEASER_ARGS)
 
 .PHONY: quickstart
 quickstart: export MANIFEST := https://github.com/operator-framework/operator-controller/releases/download/$(VERSION)/operator-controller.yaml