Update location of catalogd entrypoint

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

Author: OchiengEd

.goreleaser.yml

@@ -20,7 +20,7 @@ builds:
       - ppc64le
       - s390x
   - id: catalogd
-    main: ./catalogd/cmd/catalogd/
+    main: ./cmd/catalogd/
     binary: catalogd
     asmflags: "{{ .Env.GO_BUILD_ASMFLAGS }}"
     gcflags: "{{ .Env.GO_BUILD_GCFLAGS }}"

Makefile

@@ -264,7 +264,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) -C catalogd kind-load
+	IMAGE_REPO=$(CATALOG_IMAGE_REPO) KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME) $(MAKE) -f Makefile.catalogd kind-load
 
 .PHONY: kind-deploy
 kind-deploy: export MANIFEST := ./operator-controller.yaml
@@ -335,7 +335,7 @@ wait:
 .PHONY: docker-build
 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
-	IMAGE_REPO=$(CATALOG_IMAGE_REPO) $(MAKE) -C catalogd build-container
+	IMAGE_REPO=$(CATALOG_IMAGE_REPO) $(MAKE) -f Makefile.catalogd build-container
 
 #SECTION Release
 ifeq ($(origin ENABLE_RELEASE_PIPELINE), undefined)

Tiltfile

@@ -15,9 +15,9 @@ catalogd = {
     'image': 'quay.io/operator-framework/catalogd',
     'yaml': 'config/overlays/tilt-local-dev/catalogd',
     'binaries': {
-        './catalogd/cmd/catalogd': 'catalogd-controller-manager',
+        './cmd/catalogd': 'catalogd-controller-manager',
     },
-    'deps': ['api', 'catalogd/cmd/catalogd', 'internal/catalogd', 'internal/shared', 'go.mod', 'go.sum'],
+    'deps': ['api/catalogd', 'cmd/catalogd', 'internal/catalogd', 'internal/shared', 'go.mod', 'go.sum'],
     'starting_debug_port': 20000,
 }